Support invoking smerge from magit buffers

Closes #4458.

2 files changed, 26 insertions, 4 deletions

diff --git a/Documentation/magit.org b/Documentation/magit.org
index 7e5b8e7..4c55e11 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -8,7 +8,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit: (magit).
 #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 3.2.1 (v3.2.1-62-g5a8e3aec3+1)
+#+SUBTITLE: for version 3.2.1 (v3.2.1-64-g8771401d4+1)
 
 #+TEXINFO_DEFFN: t
 #+OPTIONS: H:4 num:3 toc:2
@@ -25,7 +25,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 #+TEXINFO: @noindent
-This manual is for Magit version 3.2.1 (v3.2.1-62-g5a8e3aec3+1).
+This manual is for Magit version 3.2.1 (v3.2.1-64-g8771401d4+1).
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>
@@ -4377,6 +4377,10 @@ variants.
 
   Remove the change at point from the working tree.
 
+  On a hunk or file with unresolved conflicts prompt which side to
+  keep (while discarding the other).  If point is within the text
+  of a side, then keep that side without prompting.
+
 - Key: v, magit-reverse
 
   Reverse the change at point in the working tree.
@@ -5506,6 +5510,13 @@ to the Magit status buffer.  The file should now be shown as
 stages the file when you save the buffer after resolving the last
 conflict.
 
+Magit now wraps the mentioned Smerge commands, allowing you to use
+these key bindings without having to go to the file-visiting buffer.
+Additionally ~k~ (~magit-discard~) on a hunk with unresolved conflicts
+asks which side to keep or, if point is on a side, then it keeps it
+without prompting.  Similarly ~k~ on a unresolved file ask which side
+to keep.
+
 Alternatively you could use Ediff, which uses separate buffers for the
 different versions of the file.  To resolve conflicts in a file using
 Ediff press ~e~ while point is on such a file in the status buffer.
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 64cd9a5..816bc3b 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 3.2.1 (v3.2.1-62-g5a8e3aec3+1)
+@subtitle for version 3.2.1 (v3.2.1-64-g8771401d4+1)
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 @noindent
-This manual is for Magit version 3.2.1 (v3.2.1-62-g5a8e3aec3+1).
+This manual is for Magit version 3.2.1 (v3.2.1-64-g8771401d4+1).
 
 @quotation
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>
@@ -5946,6 +5946,10 @@ the change to be applied to the index as well.
 
 Remove the change at point from the working tree.
 
+On a hunk or file with unresolved conflicts prompt which side to
+keep (while discarding the other).  If point is within the text
+of a side, then keep that side without prompting.
+
 @kindex v
 @cindex magit-reverse
 @item @kbd{v} @tie{}@tie{}@tie{}@tie{}(@code{magit-reverse})
@@ -7377,6 +7381,13 @@ to the Magit status buffer.  The file should now be shown as
 stages the file when you save the buffer after resolving the last
 conflict.
 
+Magit now wraps the mentioned Smerge commands, allowing you to use
+these key bindings without having to go to the file-visiting buffer.
+Additionally @code{k} (@code{magit-discard}) on a hunk with unresolved conflicts
+asks which side to keep or, if point is on a side, then it keeps it
+without prompting.  Similarly @code{k} on a unresolved file ask which side
+to keep.
+
 Alternatively you could use Ediff, which uses separate buffers for the
 different versions of the file.  To resolve conflicts in a file using
 Ediff press @code{e} while point is on such a file in the status buffer.