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.
David Pursehouse 171f84a041 Use constants from StandardCharsets instead of hard-coded strings 6 years ago
..
CherryPickTest.java Move base test classes to the junit bundle for reuse for Java 7 tests 11 years ago
MergeAlgorithmTest.java Make diff locations more consistent 7 years ago
MergeMessageFormatterTest.java Organize imports 7 years ago
RecursiveMergerTest.java Enable and fix warnings about redundant specification of type arguments 7 years ago
ResolveMergerTest.java Use constants from StandardCharsets instead of hard-coded strings 6 years ago
SimpleMergeTest.java Support creating Mergers without a Repository 7 years ago
SquashMessageFormatterTest.java SquashMessageFormatterTest: Open git in try-with-resource 8 years ago