Typo (aka incomplete refactoring).

* magit.el (magit-automatic-merge): Use rev instead of branch, stupid.
This commit is contained in:
Marius Vollmer 2008-08-17 02:54:44 +03:00
parent e067f18a2e
commit a88933a1d2

View file

@ -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