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