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-07-30 14:35:52.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-30 14:53:52.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2014-10-06 08:36:17.000000000

Patch Set 3: Patch Set 2 was rebased

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