X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/f9a044a436b05abfb853002b8d237b326dd8deb3..b5c18d9d6f568c0779d3f5d7e12eb3dffe3603da:/manual.txt?ds=sidebyside

diff --git a/manual.txt b/manual.txt
index 957fac4..b976ece 100644
--- a/manual.txt
+++ b/manual.txt
@@ -267,6 +267,7 @@ Enter	This key is "context sensitive" depending on what view you are \
 	view, split the view and show the commit diff. In the diff view \
 	pressing Enter will simply scroll the view one line down.
 Tab	Switch to next view.
+R	Reload and refresh the current view.
 Up	This key is "context sensitive" and will move the cursor one \
 	line up. However, if you opened a diff view from the main view \
 	(split- or full-screen) it will change the cursor to point to \
@@ -339,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]]