DESCRIPTION

[sync] Include merge specifications in sync-data

Adds merge specifications for source and destination branch into
GitSynchronizeData.

Also fixes resolving remote configuration for symbolic refs.

Change-Id: I16a95c6a8b120b95fa31acca28da8a97a1b8f1c9
Signed-off-by: Leslie Stephenson xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2011-06-04 01:07:58.000000000

Uploaded patch set 6.

-------------------------------------
author: Douglas Trujillo
date: 2011-06-04 01:16:26.000000000

Patch Set 6: Looks good to me, approved; Build Successful; IP review completed

rebased

-------------------------------------
author: Douglas Trujillo
date: 2011-06-04 01:16:27.000000000

Change has been successfully merged into the git repository.

-------------------------------------
