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>

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 9f73fd1fca908985207663ef1545b63e98b0ac75..48920fe42efecbe79ff0fd42c1fb1c49bc7e8f8a 100644 (file)
--- 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>();