You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Christian Halstrick 1196dd0643 Fix ResolveMerger when files should be replaced by folders 9 years ago
..
CherryPickTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago
MergeAlgorithmTest.java Do not add a newline at the end if neither merged side had one 9 years ago
MergeMessageFormatterTest.java Move SampleDataRepositoryTestCase to org.eclipse.jgit.test 10 years ago
RecursiveMergerTest.java Access static member LocalDiskRepositoryTestCase.CONTENT directly 9 years ago
ResolveMergerTest.java Fix ResolveMerger when files should be replaced by folders 9 years ago
SimpleMergeTest.java Revert "CommitBuilder should check for duplicate parents" 9 years ago
SquashMessageFormatterTest.java Move SampleDataRepositoryTestCase to org.eclipse.jgit.test 10 years ago