?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: e3c5741) | patch
Inaccurate conflict detection for moves in non-containment features29/149029/3
commit34cab1322813ebb9c0103552485d50eb536f7c01
authorlgoubet <laurent.goubet@obeo.fr>
Thu, 5 Sep 2019 09:03:13 +0000 (5 11:03 +0200)
committerlgoubet <laurent.goubet@obeo.fr>
Fri, 6 Sep 2019 15:16:03 +0000 (6 17:16 +0200)
treefc4591d4b949ee5192ba89c11c0802ed56cefa35tree | snapshot (tar.gz zip)
parente3c5741b986295cfdbc106a802d282fd35adce9ccommit | diff
Inaccurate conflict detection for moves in non-containment features

Change-Id: Iea6f9979d2e4b07b9b34ce594fe653eaaca40594
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/NonContainmentRefChangeConflictSearch.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models