| commit | 8fcb916fb0f3ae13630d9b4603e2286767d0878a | [log] [tgz] |
|---|---|---|
| author | Tanja Mayerhofer <tmayerhofer@eclipsesource.com> | Thu Sep 22 00:03:02 2016 +0200 |
| committer | Philip Langer <planger@eclipsesource.com> | Wed Oct 05 06:22:16 2016 -0400 |
| tree | eeb36899d9a4e81cecf7e5b0dffeac3ad10dacd5 | |
| parent | cd602d97ac023dc2cac936e946e0e5c45cd5ecad [diff] |
[501864] Join conflicts with overlapping diffs in SMV If multiple conflicts contain overlapping diffs, these conflicts are joined into one conflict node shown in the SMV. Overlapping diffs may occur due to the replacement of refining diffs with their refined diffs for conflict nodes. Bug: 501864 Change-Id: Ie5cb460ede7f9f7157796e6a95173b10d4fe50a2 Signed-off-by: Tanja Mayerhofer <tmayerhofer@eclipsesource.com>