From a88933a1d2ce2c8a314c49c81c1cd7cbce06aebf Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sun, 17 Aug 2008 02:54:44 +0300 Subject: [PATCH] Typo (aka incomplete refactoring). * magit.el (magit-automatic-merge): Use rev instead of branch, stupid. --- magit.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magit.el b/magit.el index 0f3f84f1..f282353b 100644 --- a/magit.el +++ b/magit.el @@ -695,7 +695,7 @@ pushed. (defun magit-automatic-merge (rev) (interactive (list (magit-read-rev "Merge"))) (if rev - (magit-run "git" "merge" (magit-rev-to-git branch)))) + (magit-run "git" "merge" (magit-rev-to-git rev)))) ;;; Rebasing