Merge "Use recursive merge by default"

2014-07-16 05:23:19 +00:00
parent a8747bab1a 7853c5b94a
commit ee5c3c6b73
2 changed files with 2 additions and 2 deletions
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
@@ -86,7 +86,7 @@ public class MergeUtil {
      Constants.R_HEADS + Constants.MASTER;

  public static boolean useRecursiveMerge(Config cfg) {
-    return cfg.getBoolean("core", null, "useRecursiveMerge", false);
+    return cfg.getBoolean("core", null, "useRecursiveMerge", true);
  }

  public static interface Factory {