X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/272818eafff98333c51f1b614704160f265405ed..b5c18d9d6f568c0779d3f5d7e12eb3dffe3603da:/manual.txt

diff --git a/manual.txt b/manual.txt
index a199ad1..b976ece 100644
--- a/manual.txt
+++ b/manual.txt
@@ -340,6 +340,9 @@ u	Update status of file. In the status view, this allows you to add an \
 	running git-add <filename>). In the stage view, when pressing this on \
 	a diff chunk line stages only that chunk for next commit, when not on \
 	a diff chunk line all changes in the displayed diff is staged.
+M	Resolve unmerged file by launching git-mergetool(1). Note, to work \
+	correctly this might require some initial configuration of your \
+	preferred merge tool. See the manpage of git-mergetool(1).
 -----------------------------------------------------------------------------
 
 [[refspec]]