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 6bc48cdc62 CommitBuilder should check for duplicate parents 12 年之前
..
CherryPickTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 年之前
MergeAlgorithmTest.java Optimize MergeAlgorithm if ours or theirs is empty 13 年之前
MergeMessageFormatterTest.java Move SampleDataRepositoryTestCase to org.eclipse.jgit.test 10 年之前
RecursiveMergerTest.java RecursiveMerger should not fail on content-merge conflicts of parents 10 年之前
ResolveMergerTest.java Fix merge/cherry-picking in CRLF mode 10 年之前
SimpleMergeTest.java CommitBuilder should check for duplicate parents 9 年之前
SquashMessageFormatterTest.java Move SampleDataRepositoryTestCase to org.eclipse.jgit.test 10 年之前