Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2017-04-04 10:00:33 +0000
committerOlivier Constant2017-04-04 10:02:09 +0000
commit1e352599ccfbce2fa3f3e2a11671bf6d133ff041 (patch)
tree5bb7af49adb1712599e162342c9ab01ebcea1649 /tests
parent6302e6b922810e24c0222864da10f89aa6be48a8 (diff)
downloadorg.eclipse.emf.diffmerge.core-1e352599ccfbce2fa3f3e2a11671bf6d133ff041.tar.gz
org.eclipse.emf.diffmerge.core-1e352599ccfbce2fa3f3e2a11671bf6d133ff041.tar.xz
org.eclipse.emf.diffmerge.core-1e352599ccfbce2fa3f3e2a11671bf6d133ff041.zip
Trivial fix on Sirius extension
Change-Id: Ia845778cafa6cc167b4190ee879e603d1716fa8b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex1.elements18
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex2.elements18
2 files changed, 36 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex1.elements
new file mode 100644
index 00000000..2fc687f2
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex1.elements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_EPuzEAB1EeGyf8Q8nDTssA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element"
+ id="__gvAUBLQEee6xq4ZkjYgQg"
+ name="E1">
+ <manyContent
+ id="_AyIWwBLREee6xq4ZkjYgQg"
+ name="E11"/>
+ <manyContent
+ id="_CrY-cBLREee6xq4ZkjYgQg"
+ name="E12"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex2.elements
new file mode 100644
index 00000000..01e73f0f
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/IndependentMove/Ex2.elements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_EPuzEAB1EeGyf8Q8nDTssA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element"
+ id="_GZSMgBLREee6xq4ZkjYgQg"
+ name="E2">
+ <manyContent
+ id="_AyIWwBLREee6xq4ZkjYgQg"
+ name="E11"/>
+ <manyContent
+ id="_CrY-cBLREee6xq4ZkjYgQg"
+ name="E12"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>

Back to the top