Commit 31ba7ea9 authored by Allen Li's avatar Allen Li Committed by Jonas Bernoulli

Fix typo in merge prompt string

parent ca5cb153
...@@ -137,7 +137,7 @@ branch, then also remove the respective remote branch." ...@@ -137,7 +137,7 @@ branch, then also remove the respective remote branch."
(defun magit--merge-absort (branch args) (defun magit--merge-absort (branch args)
(when (equal branch "master") (when (equal branch "master")
(unless (yes-or-no-p (unless (yes-or-no-p
"Do you really want to to merge `master' into another branch? ") "Do you really want to merge `master' into another branch? ")
(user-error "Abort"))) (user-error "Abort")))
(if-let ((target (magit-get-push-branch branch t))) (if-let ((target (magit-get-push-branch branch t)))
(progn (progn
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment