| commit | d040af9cba12c88fcf2bf6019c016fc3c557faa9 | [log] [tgz] |
|---|---|---|
| author | Philip Langer <planger@eclipsesource.com> | Wed Sep 02 13:55:14 2015 +0200 |
| committer | Axel RICHARD <axel.richard@obeo.fr> | Wed Sep 02 10:26:20 2015 -0400 |
| tree | 7c633a14ae9c4189fe8009d59575a191f408c67a | |
| parent | 4241310e95c680a7e9e200c534a316e45826b604 [diff] |
[476417] Collects the conflicting resources from all conflicting diffs This commit fixes the currently deactivated test cases o.e.e.c.ide.ui.tests.unit.GitLogicalMergeTest.merge007_logical() and o.e.e.c.ide.ui.tests.unit.GitLogicalMergeTest.merge007_reverse_logical() Bug: 476417 Change-Id: I19a6cc2b9075934a4f12907172ce3d51c2734574 Signed-off-by: Philip Langer <planger@eclipsesource.com>