Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2016-02-29 08:08:23 +0000
committerMathieu Cartaud2016-02-29 09:20:14 +0000
commit1df79ebeb8b351f42f419c88e3abd311a8df2ff4 (patch)
treecf5cdb7dc3856019439642f7c9cd0a1897478cee
parent6811415294368ca3e11113d328b8d1de2b1bef41 (diff)
downloadorg.eclipse.emf.compare-1df79ebeb8b351f42f419c88e3abd311a8df2ff4.tar.gz
org.eclipse.emf.compare-1df79ebeb8b351f42f419c88e3abd311a8df2ff4.tar.xz
org.eclipse.emf.compare-1df79ebeb8b351f42f419c88e3abd311a8df2ff4.zip
Fix git related tests3.2.0M6
Change-Id: Ie086aa18905a98a0224d12020a29e1cc20192548 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java
index 96e9d0dee..42a979c43 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java
@@ -200,7 +200,7 @@ public class RenamedControlledResourceTests extends CompareGitTestCase {
@Test
public void testComparisonNoConflictLocalRename() throws Exception {
setUpRenameNoConflict();
-
+ repository.checkoutBranch(BRANCH);
Comparison comparison = compare(BRANCH, MASTER, iFile1);
assertTrue(comparison.getConflicts().isEmpty());

Back to the top