Merge branch 'maint'

diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index 6bee448e7dea76ea58c6e2cb67f2cf507579b5f1..eea44d9d5613f448b8c2b8f0aae236f917efad39 100644 (file)
--- 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.