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