DESCRIPTION

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: 2014-07-29 13:37:53.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2014-07-29 13:52:39.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-29 13:53:14.000000000

Patch Set 1: Verified-1

Build Failed 

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

-------------------------------------
author: Gustavo Green
date: 2014-07-30 13:53:05.000000000

Patch Set 2: Patch Set 1 was rebased

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