| commit | a69e93cc3f989615c512a12e5a4e62ec5ff95bc8 | |
| author | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | |
| Fri, 1 Jul 2016 07:56:12 +0000 (1 09:56 +0200) | ||
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | |
| Fri, 1 Jul 2016 14:04:55 +0000 (1 10:04 -0400) | ||
| tree | 3fdc700ae064e639f14ea18fc082a8b9d5aa0cd5 | treesnapshot (tar.gz zip) |
| parent | 38670759ff36933a0bce2de15f4d878b62d8c854 | commitdiff |
Fix test broken by new default preference on pre-merge
Change-Id: Iff50e6719531b24034419e91a8088f03fddf90b4
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Change-Id: Iff50e6719531b24034419e91a8088f03fddf90b4
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
| plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java | diffblobblamehistory |