1 files changed, 192 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.notation b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.notation
new file mode 100644
index 000000000..a71be0536
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/ancestor.notation
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_zmK1oM7cEeSqqOMGqhj_Zg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_0noSoM7cEeSqqOMGqhj_Zg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0npgwM7cEeSqqOMGqhj_Zg" type="5029">
+        <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0nqH0M7cEeSqqOMGqhj_Zg" type="8510">
+        <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0nqH0c7cEeSqqOMGqhj_Zg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0nrV8M7cEeSqqOMGqhj_Zg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0nrV8c7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0nrV8s7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0nrV887cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0nrV9M7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0nrV9c7cEeSqqOMGqhj_Zg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0nrV9s7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0nrV987cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0nrV-M7cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0nrV-c7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0nr9AM7cEeSqqOMGqhj_Zg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0nr9Ac7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_0nr9As7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_0nr9A87cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0nr9BM7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ancestor.uml#_0nM00M7cEeSqqOMGqhj_Zg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0noSoc7cEeSqqOMGqhj_Zg" x="81" y="74"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1K6l4M7cEeSqqOMGqhj_Zg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1K6l4s7cEeSqqOMGqhj_Zg" type="5029">
+        <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1K6l487cEeSqqOMGqhj_Zg" type="8510">
+        <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1K6l5M7cEeSqqOMGqhj_Zg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1K6l5c7cEeSqqOMGqhj_Zg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1K6l5s7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1K6l587cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1K6l6M7cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K6l6c7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1K6l6s7cEeSqqOMGqhj_Zg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1K6l687cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1K6l7M7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1K6l7c7cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K6l7s7cEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1K6l787cEeSqqOMGqhj_Zg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1K6l8M7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1K6l8c7cEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1K6l8s7cEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K6l887cEeSqqOMGqhj_Zg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ancestor.uml#_1K5XwM7cEeSqqOMGqhj_Zg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K6l4c7cEeSqqOMGqhj_Zg" x="350" y="72"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TX4o4M7fEeSqqOMGqhj_Zg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TX4o4s7fEeSqqOMGqhj_Zg" type="5029">
+        <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TX4o487fEeSqqOMGqhj_Zg" type="8510">
+        <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TX4o5M7fEeSqqOMGqhj_Zg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TX4o5c7fEeSqqOMGqhj_Zg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TX4o5s7fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TX4o587fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TX4o6M7fEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TX4o6c7fEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TX4o6s7fEeSqqOMGqhj_Zg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TX4o687fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TX4o7M7fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TX4o7c7fEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TX4o7s7fEeSqqOMGqhj_Zg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TX4o787fEeSqqOMGqhj_Zg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TX4o8M7fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TX4o8c7fEeSqqOMGqhj_Zg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TX4o8s7fEeSqqOMGqhj_Zg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TX4o887fEeSqqOMGqhj_Zg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ancestor.uml#_TX3awM7fEeSqqOMGqhj_Zg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TX4o4c7fEeSqqOMGqhj_Zg" x="349" y="243"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CkYvcM_wEeS6X8bMfB-bzg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CkakoM_wEeS6X8bMfB-bzg" type="5029">
+        <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ckakoc_wEeS6X8bMfB-bzg" type="8510">
+        <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ckakos_wEeS6X8bMfB-bzg" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CkbLsM_wEeS6X8bMfB-bzg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CkbLsc_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CkbLss_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CkbLs8_wEeS6X8bMfB-bzg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkbLtM_wEeS6X8bMfB-bzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CkbLtc_wEeS6X8bMfB-bzg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CkbLts_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CkbLt8_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CkbLuM_wEeS6X8bMfB-bzg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkbLuc_wEeS6X8bMfB-bzg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CkbLus_wEeS6X8bMfB-bzg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CkbLu8_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CkbLvM_wEeS6X8bMfB-bzg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CkbLvc_wEeS6X8bMfB-bzg"/>
+        <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkbLvs_wEeS6X8bMfB-bzg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ancestor.uml#_Cha7AM_wEeS6X8bMfB-bzg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkYvcc_wEeS6X8bMfB-bzg" x="83" y="249"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_zmK1oc7cEeSqqOMGqhj_Zg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zmK1os7cEeSqqOMGqhj_Zg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zmK1o87cEeSqqOMGqhj_Zg">
+      <owner xmi:type="uml:Model" href="ancestor.uml#_soPaMM7cEeSqqOMGqhj_Zg"/>
+    </styles>
+    <element xmi:type="uml:Model" href="ancestor.uml#_soPaMM7cEeSqqOMGqhj_Zg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_38pGoM7cEeSqqOMGqhj_Zg" type="4001" source="_0noSoM7cEeSqqOMGqhj_Zg" target="_1K6l4M7cEeSqqOMGqhj_Zg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_38pGo87cEeSqqOMGqhj_Zg" type="6001">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38pGpM7cEeSqqOMGqhj_Zg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_38pGpc7cEeSqqOMGqhj_Zg" type="6002">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38pGps7cEeSqqOMGqhj_Zg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_38pGp87cEeSqqOMGqhj_Zg" type="6003">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38pGqM7cEeSqqOMGqhj_Zg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_38ptsM7cEeSqqOMGqhj_Zg" type="6005">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38ptsc7cEeSqqOMGqhj_Zg" x="-14" y="31"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_38ptss7cEeSqqOMGqhj_Zg" type="6033">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38pts87cEeSqqOMGqhj_Zg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_38pttM7cEeSqqOMGqhj_Zg" type="6034">
+        <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_38pttc7cEeSqqOMGqhj_Zg" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_38pGoc7cEeSqqOMGqhj_Zg"/>
+      <element xmi:type="uml:Association" href="ancestor.uml#_38mDUM7cEeSqqOMGqhj_Zg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_38pGos7cEeSqqOMGqhj_Zg" points="[50, -8, -219, -6]$[219, -8, -50, -6]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Wp4vkNLZEeSzBO7rhIZWOw" type="4001" source="_CkYvcM_wEeS6X8bMfB-bzg" target="_TX4o4M7fEeSqqOMGqhj_Zg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp5WoNLZEeSzBO7rhIZWOw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp5WodLZEeSzBO7rhIZWOw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp5WotLZEeSzBO7rhIZWOw" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp5Wo9LZEeSzBO7rhIZWOw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp5WpNLZEeSzBO7rhIZWOw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp5WpdLZEeSzBO7rhIZWOw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp59sNLZEeSzBO7rhIZWOw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp59sdLZEeSzBO7rhIZWOw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp59stLZEeSzBO7rhIZWOw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp59s9LZEeSzBO7rhIZWOw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wp59tNLZEeSzBO7rhIZWOw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wp59tdLZEeSzBO7rhIZWOw" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Wp4vkdLZEeSzBO7rhIZWOw"/>
+      <element xmi:type="uml:Association" href="ancestor.uml#_WpmbsNLZEeSzBO7rhIZWOw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wp4vktLZEeSzBO7rhIZWOw" points="[50, -3, -216, 3]$[269, -56, 3, -50]"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_SsK80NLZEeSzBO7rhIZWOw"/>
+</xmi:XMI>