diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-08-23 17:07:03 +0200 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2010-08-31 01:29:49 +0200 |
| commit | 47f4171315e1b65f2a6e7f5fc38f57d81de5db15 (patch) | |
| tree | c2e01922de343cd75ea9ab66524dfc772b491a8a | |
| parent | 45e79a526c7ffebaf8e4758a6cb6b7af05716707 (diff) | |
| download | jgit-47f4171315e1b65f2a6e7f5fc38f57d81de5db15.tar.gz jgit-47f4171315e1b65f2a6e7f5fc38f57d81de5db15.zip | |
Let Resolve be the default Merge strategy
the merge command should use by default the "resolve" merge strategy.
Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index 9f73fd1fca..48920fe42e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -84,7 +84,7 @@ import org.eclipse.jgit.treewalk.FileTreeIterator; */ public class MergeCommand extends GitCommand<MergeResult> { - private MergeStrategy mergeStrategy = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE; + private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE; private List<Ref> commits = new LinkedList<Ref>(); |