| commit | cd602d97ac023dc2cac936e946e0e5c45cd5ecad | [log] [tgz] |
|---|---|---|
| author | Tanja Mayerhofer <tmayerhofer@eclipsesource.com> | Wed Sep 21 23:37:40 2016 +0200 |
| committer | Philip Langer <planger@eclipsesource.com> | Wed Oct 05 12:21:16 2016 +0200 |
| tree | 51a90a2e12d52c6f48cbb7a10dd7c2b51e2d4cec | |
| parent | 2a559dada31c6ebdf4f6ba067619b54a1375187b [diff] |
[501864] Replace refining diffs in SMV conflict nodes with refined diffs If a conflict contains refining diffs, the conflict node shown in the SMV replaces these refining diffs with their refined diffs. The refining diffs are shown as children of the refined diffs. Bug: 501864 Change-Id: I21ae22c41e0f384904228fa0b0ffd07cd1c10dad Signed-off-by: Tanja Mayerhofer <tmayerhofer@eclipsesource.com> Signed-off-by: Philip Langer <planger@eclipsesource.com>