X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fuser-manual.txt;h=1c49e6995b42e42f1aba4e7b24d073e50c3b5234;hb=3a81b9f571a6b7edd83b3d5f27c3c95d9b1c9d5c;hp=3ed9f84524cd850335f97c0b8260dfc1fde66437;hpb=fd2a75972e90d34bc8d4bebe1d669645557a2192;p=git.git

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 3ed9f8452..1c49e6995 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2869,7 +2869,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
 ----------------------------------------------