From 47f4171315e1b65f2a6e7f5fc38f57d81de5db15 Mon Sep 17 00:00:00 2001 From: Christian Halstrick Date: Mon, 23 Aug 2010 17:07:03 +0200 Subject: [PATCH] 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 --- org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { - private MergeStrategy mergeStrategy = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE; + private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE; private List commits = new LinkedList(); -- 2.39.5