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.
2002 Commits
49 Branches
Tree: dac66672df
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'dac66672df'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Kevin Sawicki c403d0b187 Compare modes before comparing ids in ResolveMerger 12 years ago
..
MergeAlgorithm.java Optimize MergeAlgorithm if ours or theirs is empty 13 years ago
MergeChunk.java Fix Javadoc warnings 14 years ago
MergeFormatter.java Refactor diff sequence API 13 years ago
MergeMessageFormatter.java Adapt merge message to C Git for remote-tracking branch 12 years ago
MergeResult.java Refactor diff sequence API 13 years ago
MergeStrategy.java Move JGitText to an internal package 12 years ago
Merger.java Move JGitText to an internal package 12 years ago
ResolveMerger.java Compare modes before comparing ids in ResolveMerger 12 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 Fix ClassCastException in MergeCommand 12 years ago