tree eb5c5e2d2024a545f1c8e10c8595fdeaed96d485
parent 85571f4a0b0ce4ea1edea21d0c817f44a694816a
author Laurent Delaigue <laurent.delaigue@obeo.fr> 1476456312 +0200
committer Laurent Delaigue <laurent.delaigue@obeo.fr> 1476684725 +0200

[505994] Fix cascading filter on refined diffs

Refined diffs that are not in direct conflict but have at least on
refining diff in REAL conflict should not be filtered out by the
cascading filter.

bug: 505994
Change-Id: Ife2ccc3d6319e381c16d5d2a5a68295e7a73ac6a
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>