diff options
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java (renamed from org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java) | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java (renamed from org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java index 190224a855..ee99aa1379 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java @@ -83,7 +83,7 @@ import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; @RunWith(Theories.class) -public class RecursiveMergerTest extends RepositoryTestCase { +public class CrissCrossMergeTest extends RepositoryTestCase { static int counter = 0; @DataPoints diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java index 2f8d606e6c..58093a3729 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java @@ -97,7 +97,7 @@ import org.junit.experimental.theories.Theory; import org.junit.runner.RunWith; @RunWith(Theories.class) -public class ResolveMergerTest extends RepositoryTestCase { +public class MergerTest extends RepositoryTestCase { @DataPoints public static MergeStrategy[] strategiesUnderTest = new MergeStrategy[] { |