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.
1359 Commits
49 Branches
Tree: 761b9285f0
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '761b9285f0'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Philipp Thun 761b9285f0 Do not categorize merge failures as 'abnormal' 13 years ago
..
MergeAlgorithm.java Change default diff algorithm to histogram and add tests 13 years ago
MergeChunk.java Fix Javadoc warnings 14 years ago
MergeFormatter.java Refactor diff sequence API 13 years ago
MergeMessageFormatter.java Don't print "into HEAD" when merging refs/heads/master 13 years ago
MergeResult.java Refactor diff sequence API 13 years ago
MergeStrategy.java Extend merge support for bare repositories 13 years ago
Merger.java Add getBaseCommit() to Merger 13 years ago
ResolveMerger.java Do not categorize merge failures as 'abnormal' 13 years ago
StrategyOneSided.java Extend merge support for bare repositories 13 years ago
StrategyResolve.java Extend merge support for bare repositories 13 years ago
StrategySimpleTwoWayInCore.java Simplify logic in StrategySimpleTwoWayInCore 13 years ago
ThreeWayMergeStrategy.java Extend merge support for bare repositories 13 years ago
ThreeWayMerger.java Extend merge support for bare repositories 13 years ago