| commit | 776044b8a9d95e30770233fdfd1bce28228dc9a2 | [log] [tgz] |
|---|---|---|
| author | Laurent Delaigue <laurent.delaigue@obeo.fr> | Mon May 09 08:57:06 2016 +0200 |
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | Mon Sep 12 18:11:12 2016 +0200 |
| tree | 6fff7a043aac2ecc5055f6c89269232b2f4ef219 | |
| parent | 741f9ffd6108a4a0e42b2a2648bd29cb048e6ea7 [diff] |
Add support for additive merge * Add a custom ResourceMappingMerger and specific mergers associated (reference merger and conflict merger) * Add a mechanism to select the merger for a diff not only by rank, but also by another criterion, whose semantics is free (IMergeCriterion) Change-Id: Ib32f8430bc58e69e627640efbafecdfae0279f04 Also-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>