X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fcore-intro.txt;h=eea44d9d5613f448b8c2b8f0aae236f917efad39;hb=aa3698516109df16f763ed2f0182075edabd7ea0;hp=6bee448e7dea76ea58c6e2cb67f2cf507579b5f1;hpb=cef19c7af5202c547abe4c8a538ac7b9a4970f0e;p=git.git

diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index 6bee448e7..eea44d9d5 100644
--- a/Documentation/core-intro.txt
+++ b/Documentation/core-intro.txt
@@ -588,4 +588,5 @@ 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.