[505983] Pseudo-conflicts should be real on ADD/ADD
When adding matching objects in differents indices in a list, all the
diffs were marked as pseudo-conflicts. At least some of them should be
real conflicts.
This patch fixes the issue by marking all such diffs as real conflicts
but it should be possible to improve it to have some of them marked as
pseudo where it would make sense.
Code shared by default conflict detector and match-based conflict
detector is extracted into MatchUtil to reduce duplication.
Bug: 505983
Change-Id: Icca55a1fcccc08cd5d858639d4c6dd8734f327a9
Also-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
10 files changed
