diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-07 10:37:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 19:33:03 -0800 |
| commit | 207dfa07919baba034291f1d5169f86272839d59 (patch) | |
| tree | b177a070dc2902fa269865e8d41d3a8e825c4aef /Documentation/user-manual.txt | |
| parent | 07fef5fc1599d11f5750ae2440e0da6616c297b8 (diff) | |
| download | git-207dfa07919baba034291f1d5169f86272839d59.tar.gz | |
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index c5e9ea8a42..03736bbcd3 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2755,7 +2755,7 @@ 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. How git stores objects efficiently: pack files ---------------------------------------------- |