diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java index 2224dbc448..979685c409 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java @@ -76,21 +76,25 @@ public class StrategyOneSided extends MergeStrategy { treeIndex = index; } + /** {@inheritDoc} */ @Override public String getName() { return strategyName; } + /** {@inheritDoc} */ @Override public Merger newMerger(final Repository db) { return new OneSide(db, treeIndex); } + /** {@inheritDoc} */ @Override public Merger newMerger(final Repository db, boolean inCore) { return new OneSide(db, treeIndex); } + /** {@inheritDoc} */ @Override public Merger newMerger(final ObjectInserter inserter, final Config config) { return new OneSide(inserter, treeIndex); |