the merge command should use by default the "resolve" merge strategy. Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>tags/v0.9.1
@@ -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>(); | |||