commit b6d0be4ef8056a11690e2d0ce514476befcf2f1b
author Martin Fleck <mfleck@eclipsesource.com> Fri Jan 20 10:36:09 2017 +0100
committer Laurent Goubet <laurent.goubet@obeo.fr> Tue Jun 27 11:14:34 2017 -0400
tree 8bd4ff680a14e694649e0f5b7bbafdc16b0d806f
parent 8bc41b3003625c3b09dc171f0ab383929ce04d72

[487151] Accept all non-conflicting changes fails to merge some diffs

Adapt diff merge computer to only return diffs that actually lead to a
conflict in the exception and not all connected diffs to ensure that
non-conflicting diffs are merged.

Includes tests.

Bug: 487151
Change-Id: I3f08e09c3e67066c57d86f572dc66a2d09ca5bb2
Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
Also-by: Simon Delisle <simon.delisle@ericsson.com>