DESCRIPTION

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

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


COMMENTS

author: Rylee Bush
date: 2015-03-26 09:31:15.000000000

Uploaded patch set 6.

-------------------------------------
author: Brenden Conley
date: 2015-03-26 10:20:47.000000000

Patch Set 6:

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

-------------------------------------
author: Brenden Conley
date: 2015-03-26 10:37:34.000000000

Patch Set 6: Verified+1

Build Successful 

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

-------------------------------------
author: Gustavo Green
date: 2015-04-02 08:12:01.000000000

Abandoned

Replaced by another review tree

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