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.
Shawn O. Pearce 67263e2056 Refactor diff sequence API 13 years ago
..
MergeAlgorithm.java Refactor diff sequence API 13 years ago
MergeChunk.java Fix Javadoc warnings 14 years ago
MergeFormatter.java Refactor diff sequence API 13 years ago
MergeResult.java Refactor diff sequence API 13 years ago
MergeStrategy.java Added merge strategy RESOLVE 13 years ago
Merger.java Add getBaseCommit() to Merger 14 years ago
ResolveMerger.java Refactor diff sequence API 13 years ago
StrategyOneSided.java Initial JGit contribution to eclipse.org 14 years ago
StrategyResolve.java Added merge strategy RESOLVE 13 years ago
StrategySimpleTwoWayInCore.java Use ObjectReader in DirCacheBuilder.addTree 14 years ago
ThreeWayMergeStrategy.java Initial JGit contribution to eclipse.org 14 years ago
ThreeWayMerger.java Initial JGit contribution to eclipse.org 14 years ago