diff options
| author | Mikaël Barbero | 2012-07-19 08:44:10 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2012-07-19 08:44:10 +0000 |
| commit | c57389e96b7fff4ab0bf9d8528f92f455b9c52fa (patch) | |
| tree | a64ee0ecebfdc12841e11b3fcbc09b9449579c91 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes | |
| parent | e152358b094a18f20ac856725811f0ba4f521d29 (diff) | |
| download | org.eclipse.emf.compare-c57389e96b7fff4ab0bf9d8528f92f455b9c52fa.tar.gz org.eclipse.emf.compare-c57389e96b7fff4ab0bf9d8528f92f455b9c52fa.tar.xz org.eclipse.emf.compare-c57389e96b7fff4ab0bf9d8528f92f455b9c52fa.zip | |
change the MatchItemProvider that give containment change diff as child
of the match
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes new file mode 100644 index 000000000..cd1e0b567 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/i/conflict_i_right.nodes @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ASCII"?> +<nodes:Node + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" + xmi:id="_rqDnEJRfEeGwLqrAWz-_6w" + name="P"> + <containmentRef1 xmi:id="_Np10YJRiEeGwLqrAWz-_6w" name="C"> + <containmentRef1 xmi:id="_Np11YJRiEeGwLqrAWz-_7w" name="A1"/> + <containmentRef1 xmi:id="_Np12YJRiEeGwLqrAWz-_8w" name="A2"/> + </containmentRef1> +</nodes:Node> |