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