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