diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-07 21:37:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 06:33:03 +0300 |
| commit | 207dfa07919baba034291f1d5169f86272839d59 (patch) | |
| tree | b177a070dc2902fa269865e8d41d3a8e825c4aef /Documentation/core-intro.txt | |
| parent | 07fef5fc1599d11f5750ae2440e0da6616c297b8 (diff) | |
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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. |