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