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.
Robin Stocker b0245b548b Don't print "into HEAD" when merging refs/heads/master 13 年之前
..
MergeAlgorithm.java Change default diff algorithm to histogram and add tests 13 年之前
MergeChunk.java Fix Javadoc warnings 14 年之前
MergeFormatter.java Refactor diff sequence API 13 年之前
MergeMessageFormatter.java Don't print "into HEAD" when merging refs/heads/master 13 年之前
MergeResult.java Refactor diff sequence API 13 年之前
MergeStrategy.java Extend merge support for bare repositories 13 年之前
Merger.java Add getBaseCommit() to Merger 13 年之前
ResolveMerger.java Fix misc spelling errors in comments and method names 13 年之前
StrategyOneSided.java Extend merge support for bare repositories 13 年之前
StrategyResolve.java Extend merge support for bare repositories 13 年之前
StrategySimpleTwoWayInCore.java Simplify logic in StrategySimpleTwoWayInCore 13 年之前
ThreeWayMergeStrategy.java Extend merge support for bare repositories 13 年之前
ThreeWayMerger.java Extend merge support for bare repositories 13 年之前