| commit | 0c29d5db83bea1868aabfac3fb44d30ef95fc05e | [log] [tgz] |
|---|---|---|
| author | Stefan Dirix <sdirix@eclipsesource.com> | Wed May 06 12:42:07 2015 +0200 |
| committer | Axel RICHARD <axel.richard@obeo.fr> | Mon May 11 13:17:28 2015 -0400 |
| tree | 2d10acf2e3a10075eb5c2c0206f130fe958cde3e | |
| parent | 947f278f8c9abe7f5ca2493a76d9a0adbec5fd48 [diff] |
[466552] Increase priorities of conflict mergers Increases the priority of the PseudoConflictMerger to 75 and the priority of the ConflictMerger to 100. This fixes merging issues originating from a too small PseudoConflictMerger priority value. Also offers a lot more possibilities for merger prioritizations by clients. Includes a testcase for UML models. Bug: 466552 Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com> Change-Id: I29f964a47fb80d34cc6546afadab52d45204c12d