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