diff options
| author | Laurent Delaigue | 2016-10-24 15:40:47 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-10-24 15:40:47 +0000 |
| commit | 72972f4bb54dd7650da6f73aab42da39cda316f3 (patch) | |
| tree | fa804dc8588ec647dc5de44a0f8db12d60079717 /plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java | |
| parent | 14123b883ed31ca999c92a153cd9ba4a01672212 (diff) | |
| parent | e23418ba774fcdfbf97e13edc7e9bf4119b17231 (diff) | |
| download | org.eclipse.emf.compare-72972f4bb54dd7650da6f73aab42da39cda316f3.tar.gz org.eclipse.emf.compare-72972f4bb54dd7650da6f73aab42da39cda316f3.tar.xz org.eclipse.emf.compare-72972f4bb54dd7650da6f73aab42da39cda316f3.zip | |
Merge branch 'master' into 3.3
Change-Id: I9ed00ead81d6c4685835b93c8eb2623751bfe7fb
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java index 30270e033..ba39f3142 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java @@ -21,6 +21,7 @@ import static org.eclipse.emf.compare.DifferenceKind.MOVE; import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature; import static org.eclipse.emf.compare.utils.EMFComparePredicates.possiblyConflictingWith; +import static org.eclipse.emf.compare.utils.MatchUtil.matchingIndices; import com.google.common.collect.Iterables; |