Merge pull request #706 from shijinglu/turnOffDefaultMergeInBare

Turn off merge with bare in normal merge mode
twosigma · May 22, 2019 · 2a1377b · 2a1377b
2 parents 0479e22 + cb2a576
commit 2a1377b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/node/lib/cmd/merge.js b/node/lib/cmd/merge.js
@@ -173,7 +173,7 @@ Merge of '${commitName}'
                                          null,
                                          commit,
                                          mode,
-                                         Open.SUB_OPEN_OPTION.ALLOW_BARE,
+                                         Open.SUB_OPEN_OPTION.FORCE_OPEN,
                                          args.message,
                                          editMessage);
     if (null !== result.errorMessage) {