commit 78e37cb0bbd9d806af97dfdae8f48db30a5d1cf7
author Tanja Mayerhofer <tmayerhofer@eclipsesource.com> Mon Oct 10 20:42:45 2016 +0200
committer Tanja Mayerhofer <tmayerhofer@eclipsesource.com> Tue Oct 11 10:52:41 2016 +0200
tree 121a909742da3a2fc79217aae2060551e2056b4e
parent 8fcb916fb0f3ae13630d9b4603e2286767d0878a

[501864] Adapts diff filters for conflicting refined diffs

If a refined diff has a direct or indirect real conflict or all its
refining diffs have pseudo conflicts, they should not be shown in the
difference groups (left/right side). However, refined diffs that are
redefined by both diffs that have pseudo conflicts and diffs that do not
have any conflicts should be shown in the difference groups.

Bug: 501864
Change-Id: I9dd640e3736d0ca98ef194965ee8f62a3404c06c
Signed-off-by: Tanja Mayerhofer <tmayerhofer@eclipsesource.com>