Shawn Pearce 591e39bf9d Revert "Fix warnings about unchecked conversion of MergeResult" | pirms 8 gadiem | |
---|---|---|
.. | ||
CherryPickTest.java | pirms 11 gadiem | |
MergeAlgorithmTest.java | pirms 8 gadiem | |
MergeMessageFormatterTest.java | pirms 8 gadiem | |
RecursiveMergerTest.java | pirms 8 gadiem | |
ResolveMergerTest.java | pirms 8 gadiem | |
SimpleMergeTest.java | pirms 9 gadiem | |
SquashMessageFormatterTest.java | pirms 8 gadiem |