DESCRIPTION

[wip] Allow pre-merging from Mapping Mergers in case of conflicts

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


COMMENTS

author: Gustavo Green
date: 2015-03-12 09:30:08.000000000

Patch Set 5: Commit message was updated

-------------------------------------
author: Brenden Conley
date: 2015-03-12 11:14:29.000000000

Patch Set 5:

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

-------------------------------------
author: Brenden Conley
date: 2015-03-12 11:14:58.000000000

Patch Set 5: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/6822/ : FAILURE

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