diff options
author | Mathieu Cartaud | 2016-07-06 15:45:15 +0000 |
---|---|---|
committer | Mathieu Cartaud | 2016-07-11 07:49:52 +0000 |
commit | a5e980797626b8b5b04c712f2b1374ba7487e4c3 (patch) | |
tree | 156a8333144b962fb0d6c619e65bca1dde6fc7a9 /plugins/org.eclipse.emf.compare.tests/src | |
parent | e5c952a658e757c5989d9ec1767b605000d57b9b (diff) | |
download | org.eclipse.emf.compare-a5e980797626b8b5b04c712f2b1374ba7487e4c3.tar.gz org.eclipse.emf.compare-a5e980797626b8b5b04c712f2b1374ba7487e4c3.tar.xz org.eclipse.emf.compare-a5e980797626b8b5b04c712f2b1374ba7487e4c3.zip |
Format with mars formatter files forgotten in previous iteration
Change-Id: I27a0a3a6a0b6f11cd44e0c5c2c564cece959eaed
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src')
-rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java index 0b66e2724..0ce16ab85 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java @@ -106,7 +106,8 @@ public class ComplexMergeTest { public static Iterable<Object[]> data() { Collection<List<Predicate<? super Diff>>> rightConflictPermutations = permutations( Arrays.<Predicate<? super Diff>> asList(added("Root.Node0"), //$NON-NLS-1$ - moved("Root.Node1", "containmentRef1"), moved("Root.Node6", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + moved("Root.Node1", "containmentRef1"), //$NON-NLS-1$ //$NON-NLS-2$ + moved("Root.Node6", //$NON-NLS-1$ "containmentRef1"), //$NON-NLS-1$ added("Root.Node9"))); //$NON-NLS-1$ Collection<List<Predicate<? super Diff>>> leftConflictPermutations = permutations( |