X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/272818eafff98333c51f1b614704160f265405ed..refs/tags/tig-0.9.1:/tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index fa4f473..8e37efc 100644
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -233,6 +233,7 @@ stop-loading		Stop all loading views
 toggle-lineno		Toggle line numbers
 toggle-rev-graph	Toggle revision graph visualization
 status-update		Update file status
+status-merge		Resolve unmerged file
 edit			Open in editor
 cherry-pick		Cherry-pick commit to current branch
 ------------------------------------------------------------------------------