DESCRIPTION

Allow pre-merging from Mapping Mergers in case of conflicts

Signed-off-by: Gustavo Green xxx@xxx.xxx
Change-Id: I70210975e79263f3ecbdc7665970c1d58b4f0f78


COMMENTS

author: Brenden Conley
date: 2015-01-13 11:14:07.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2015-01-13 11:29:46.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/6615/ : SUCCESS

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