[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 09ac715a91 2/3: magit-checkout-read-stage: Resp
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit 09ac715a91 2/3: magit-checkout-read-stage: Respect magit-verbose-messages |
|
Date: |
Mon, 1 May 2023 11:11:58 -0400 (EDT) |
branch: elpa/git-commit
commit 09ac715a91fcdcfbf54d3ce11f909f29501fc582
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-checkout-read-stage: Respect magit-verbose-messages
Re #8515.
---
lisp/magit-merge.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 5064bf4348..ac545a09b6 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -286,7 +286,8 @@ then also remove the respective remote branch."
(magit-read-char-case (format "For %s checkout: " file) t
(?o "[o]ur stage" "--ours")
(?t "[t]heir stage" "--theirs")
- (?c "[c]onflict" "--merge")))
+ (?c (if magit-verbose-messages "restore [c]onflict" "[c]onflict")
+ "--merge")))
;;; Sections