a8f8d10ef8d1de13e7ae9df5f0d3e389e3e2da39 - gerrit/emfcompare/org.eclipse.emf.compare - Git at Google

commit: a8f8d10ef8d1de13e7ae9df5f0d3e389e3e2da39
[log]
author: lgoubet <laurent.goubet@obeo.fr>
Wed Sep 04 16:57:49 2019 +0200
committer: lgoubet <laurent.goubet@obeo.fr>
Wed Sep 04 16:57:49 2019 +0200
tree: 05199d7f7cf3385d8f88547bcd916f1205138c69
parent: 057565817412dd193eac16a0c389be9c5474e727 [diff]

Conflict detection on index changes must take FeatureFilter into account

Change-Id: I5300af5342fcefb01aeee618a133e30933e9c4d2

9 files changed

tree: 05199d7f7cf3385d8f88547bcd916f1205138c69