Typo (aka incomplete refactoring).
* magit.el (magit-automatic-merge): Use rev instead of branch, stupid.
This commit is contained in:
parent
e067f18a2e
commit
a88933a1d2
1 changed files with 1 additions and 1 deletions
2
magit.el
2
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue