| commit | 437f8b87681504931f33a4952283625215266ccb | [log] [tgz] |
|---|---|---|
| author | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | Fri Oct 14 16:37:08 2016 +0200 |
| committer | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | Mon Oct 17 16:40:32 2016 +0200 |
| tree | fd39e2b38b60ed067ee923ecf0fe948073e5d7ef | |
| parent | 79a106f3eb0ed4dd7cd00c2cefa5cbf59104fde8 [diff] |
[505986] Fix decorator on conflicting refined diffs Refined diffs that are not in a conflict but have at least one of their refining diffs (recursively) in a real conflict should have the conflicting decorator. They should have the pseudo conflict decorator if all their atomic refining diffs are in pseudo-conflict. Bug: 505986 Change-Id: I6957e28f05d98ae9c327c0f65fbd5dc29a24d8ec Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>