[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 5d997f2: magit-stash-both: Fix typo
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 5d997f2: magit-stash-both: Fix typo |
Date: |
Sun, 8 Aug 2021 16:57:20 -0400 (EDT) |
branch: elpa/git-commit
commit 5d997f2fd2f94bbcb508b8a7d4e9169c51cc7503
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-stash-both: Fix typo
---
lisp/magit-stash.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 62c143a..2dd1446 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -129,7 +129,7 @@ while two prefix arguments are equivalent to `--all'."
(progn (when (and (magit-merge-in-progress-p)
(not (magit-y-or-n-p "\
Stashing and resetting during a merge conflict. \
-Applying the resulting stash won't restored the merge state. \
+Applying the resulting stash won't restore the merge state. \
Proceed anyway? ")))
(user-error "Abort"))
(magit-stash-read-args)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/git-commit 5d997f2: magit-stash-both: Fix typo,
ELPA Syncer <=