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 години