diff options
Diffstat (limited to 'Documentation/core-intro.txt')
| -rw-r--r-- | Documentation/core-intro.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt index abafefc71c..24b060b91e 100644 --- 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. |