mirrors
/
jgit
mirror of https://github.com/eclipse/jgit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 204 Wiki Activity
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.
8425 Commits
49 Branches
Tree: 729c92d723
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '729c92d723'
${ noResults }
jgit/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge
Marija Savtchouk 7ceb61494b Allow file mode conflicts in virtual base commit on recursive merge. 3 years ago
..
CherryPickTest.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
CrissCrossMergeTest.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
GitlinkMergeTest.java GitlinkMergeTest: fix boxing warnings 3 years ago
MergeAlgorithmTest.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeMessageFormatterTest.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergerTest.java Allow file mode conflicts in virtual base commit on recursive merge. 3 years ago
SimpleMergeTest.java SimpleMergeTest: Clean up code style 4 years ago
SquashMessageFormatterTest.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago