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 f50294461b Remove unnecessary semicolon in MergeChunk 14 years ago
..
MergeAlgorithm.java Add file content merge algorithm 14 years ago
MergeChunk.java Remove unnecessary semicolon in MergeChunk 14 years ago
MergeFormatter.java Add file content merge algorithm 14 years ago
MergeResult.java Add file content merge algorithm 14 years ago
MergeStrategy.java Initial JGit contribution to eclipse.org 14 years ago
Merger.java Initial JGit contribution to eclipse.org 14 years ago
StrategyOneSided.java Initial JGit contribution to eclipse.org 14 years ago
StrategySimpleTwoWayInCore.java Initial JGit contribution to eclipse.org 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