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.
Marija Savtchouk 7ceb61494b Allow file mode conflicts in virtual base commit on recursive merge. hace 3 años
..
CherryPickTest.java Update EDL 1.0 license headers to new short SPDX compliant format hace 4 años
CrissCrossMergeTest.java Update EDL 1.0 license headers to new short SPDX compliant format hace 4 años
GitlinkMergeTest.java GitlinkMergeTest: fix boxing warnings hace 3 años
MergeAlgorithmTest.java Update EDL 1.0 license headers to new short SPDX compliant format hace 4 años
MergeMessageFormatterTest.java Update EDL 1.0 license headers to new short SPDX compliant format hace 4 años
MergerTest.java Allow file mode conflicts in virtual base commit on recursive merge. hace 3 años
SimpleMergeTest.java SimpleMergeTest: Clean up code style hace 4 años
SquashMessageFormatterTest.java Update EDL 1.0 license headers to new short SPDX compliant format hace 4 años