Add support for launching git-mergetool from the status view

[tig] / manual.txt

diff --git a/manual.txt b/manual.txt
index 957fac4..b976ece 100644 (file)
--- 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]]