diff options
| author | Laurent Delaigue | 2016-05-09 06:57:06 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-09-12 16:11:12 +0000 |
| commit | 776044b8a9d95e30770233fdfd1bce28228dc9a2 (patch) | |
| tree | 6fff7a043aac2ecc5055f6c89269232b2f4ef219 /plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di | |
| parent | 741f9ffd6108a4a0e42b2a2648bd29cb048e6ea7 (diff) | |
| download | org.eclipse.emf.compare-776044b8a9d95e30770233fdfd1bce28228dc9a2.tar.gz org.eclipse.emf.compare-776044b8a9d95e30770233fdfd1bce28228dc9a2.tar.xz org.eclipse.emf.compare-776044b8a9d95e30770233fdfd1bce28228dc9a2.zip | |
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>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di new file mode 100644 index 000000000..bf9abab34 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/additive/conflicts/test1/commit3/model.di @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/> |