DESCRIPTION

Integrate merge tool into synchronize view 

Bug: 343595

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


COMMENTS

author: Brenden Conley
date: 2011-07-14 11:49:15.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2011-07-14 11:55:09.000000000

Patch Set 1: Build Successful

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

-------------------------------------
author: Leslie Stephenson
date: 2011-07-14 11:57:58.000000000

Patch Set 1: I would prefer that you didn't submit this

(1 inline comment)



Line:39, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/SupportedContextActionsHelper.java -> s/commit/merge/

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