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.
George C. Young ab99b78ca0 Implement recursive merge strategy 11 years ago
..
CherryPickTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago
MergeAlgorithmTest.java Optimize MergeAlgorithm if ours or theirs is empty 13 years ago
MergeMessageFormatterTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago
RecursiveMergerTest.java Implement recursive merge strategy 11 years ago
ResolveMergerTest.java Implement recursive merge strategy 11 years ago
SimpleMergeTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago
SquashMessageFormatterTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago