Fix: switches for merge was ignored

suhailshergill · Jun 4, 2012 · 62e3089 · 62e3089
1 parent 46662c9
commit 62e3089
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/magit.el b/magit.el
@@ -3646,7 +3646,10 @@ user input."
 \('git merge REVISION')."
   (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
   (when revision
-    (magit-run-git "merge" "--no-commit" (magit-rev-to-git revision))
+    (apply 'magit-run-git
+           "merge" "--no-commit"
+           (magit-rev-to-git revision)
+           magit-custom-options)
     (when (file-exists-p ".git/MERGE_MSG")
         (magit-log-edit))))