MOVE differences also need to take into account the FeatureFilter

Containment moves may have (in)significant ordering as well, so we
need to check what the FeatureFilter tells us on those

Change-Id: I97f2a5f90db3483f3965a13e4dbc1df2d2ad7453

plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java

diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java
index 9cc4c16..15eb58e 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java
@@ -283,9 +283,22 @@
 			for (ReferenceChange candidate : Iterables.filter(refChanges,
 					and(possiblyConflictingWith(diff), ofKind(MOVE)))) {
 				if (candidate.getReference().isContainment()) {
-					if (candidate.getReference() == feature && candidate.getMatch() == diff.getMatch()
-							&& matchingIndices(diff.getMatch(), feature, value, candidate.getValue())) {
-						conflict(candidate, PSEUDO);
+					// This is a containment move. It is the only case in which we could have a "move"
+					// difference in a reference where order is not significant
+					if (candidate.getReference() == feature && candidate.getMatch() == diff.getMatch()) {
+						// Same element has been moved into the same container on both sides. If we care about
+						// ordering in this new containment reference, check the indices to detect potential
+						// real conflicts.
+						FeatureFilter featureFilter = getFeatureFilter(comparison);
+						if (featureFilter == null || featureFilter.checkForOrderingChanges(feature)) {
+							if (matchingIndices(diff.getMatch(), feature, value, candidate.getValue())) {
+								conflict(candidate, PSEUDO);
+							} else {
+								conflict(candidate, REAL);
+							}
+						} else {
+							conflict(candidate, PSEUDO);
+						}
 					} else {
 						conflict(candidate, REAL);
 					}