DESCRIPTION

Support "Mark as merged" in Synchronize View

After resolving merge conflicts, users should be able to use "Mark as
Merged" in the Synchronize view which is equivalent to Add in git.

Change-Id: I2e76ce105a991ffadae9d3004927b7867c8e99a4
Signed-off-by: Marley Hopkins xxx@xxx.xxx


COMMENTS

author: Marley Hopkins
date: 2011-07-15 14:10:45.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2011-07-15 14:10:48.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/1275/ 

-------------------------------------
author: Brenden Conley
date: 2011-07-15 14:15:46.000000000

Patch Set 2: Build Successful

Build Successful 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1275/ : SUCCESS

-------------------------------------
author: Leslie Stephenson
date: 2011-07-15 14:20:43.000000000

Patch Set 2: Looks good to me, approved; IP review completed



-------------------------------------
author: Leslie Stephenson
date: 2011-07-15 14:20:47.000000000

Change has been successfully merged into the git repository.

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