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: 2014-10-06 10:12:36.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2014-10-06 10:27:46.000000000

Patch Set 3: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2015-01-13 10:16:58.000000000

Patch Set 4: Patch Set 3 was rebased

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