Merge branch 'js/reverse'

[git.git] / Documentation / core-intro.txt

diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index abafefc71c37d8a3015f0227d24da0f07096fe4c..24b060b91e25855c47ef594dfcbeca43cdb5e677 100644 (file)
--- a/Documentation/core-intro.txt
+++ b/Documentation/core-intro.txt
@@ -587,4 +587,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.