From aa7be667bcca4bdb28b2485e28a05da54c431df7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 25 Mar 2013 03:39:58 +0100 Subject: Make recursive merge strategy the default merge strategy Use recursive merge as the default strategy since it can successfully merge more cases than the resolve strategy can. This is also the default in native Git. Change-Id: I38fd522edb2791f15d83e99038185edb09fed8e1 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit.pgm.test/tst') diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java index d0b363baa9..8c5066af5f 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java @@ -97,7 +97,7 @@ public class MergeTest extends CLIRepositoryTestCase { git.add().addFilepattern("side").call(); git.commit().setMessage("side commit").call(); - assertEquals("Merge made by the '" + MergeStrategy.RESOLVE.getName() + assertEquals("Merge made by the '" + MergeStrategy.RECURSIVE.getName() + "' strategy.", execute("git merge master")[0]); } -- cgit v1.2.3