Merge branch 'maint'

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 7b6dc22e7bad8bfc3d6f018e47e2025f2a1508ee..34e965104b892ff0353064f254414cb744da85d4 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2752,7 +2752,7 @@ stages to temporary files and calls a "merge" script on it:
 $ git-merge-index git-merge-one-file hello.c
 -------------------------------------------------
 
-and that is what higher level `git resolve` is implemented with.
+and that is what higher level `git merge -s resolve` is implemented with.
 
 How git stores objects efficiently: pack files
 ----------------------------------------------