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