[nongnu] elpa/git-commit bbf95a330d: smerge-keep-all: New command

[ELPA Syncer]

branch: elpa/git-commit
commit bbf95a330db0545b3fe3a675324a3ece35078776
Author: chenli <me@linux.beauty>
Commit: Li Chen <lchen@ambarella.com>

    smerge-keep-all: New command
---
 lisp/magit-apply.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index bd18f78acd..9fa70bd6ba 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -776,6 +776,11 @@ a separate commit.  A typical workflow would be:
   (interactive)
   (magit-call-smerge #'smerge-keep-lower))
 
+(defun magit-smerge-keep-all ()
+  "Keep all versions of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-all))
+
 (defun magit-call-smerge (fn)
   (pcase-let* ((file (magit-file-at-point t t))
                (keep (get-file-buffer file))