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.
Shawn O. Pearce a02be9725c Remove empty iterator from TreeWalk 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 Format merge commit messages like C Git 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 14 years ago
ResolveMerger.java Remove empty iterator from TreeWalk 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 Remove empty iterator from TreeWalk 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