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.
Robin Rosenberg a57dd1c164 Declare essentially static methods as static 11 years ago
..
CherryPickTest.java Declare essentially static methods as static 11 years ago
MergeAlgorithmTest.java Optimize MergeAlgorithm if ours or theirs is empty 13 years ago
MergeMessageFormatterTest.java Adapt merge message to C Git for remote-tracking branch 12 years ago
ResolveMergerTest.java Refactor ResolveMergerTest to allow testing multiple strategies 11 years ago
SimpleMergeTest.java Declare essentially static methods as static 11 years ago
SquashMessageFormatterTest.java Add "--squash" option to MergeCommand 12 years ago