diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
| commit | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (patch) | |
| tree | 2375e3b4aea11444375f9f587c8ca4cd8d22d6d0 /Documentation/merge-options.txt | |
| parent | 423325a2d24638ddcc82ce47be5e40be550f4507 (diff) | |
| parent | b825e6ff5d003db8efd1ed43cdbbb9d637df0a0c (diff) | |
| download | git-0.99.9m.tar.xz | |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index eebaf3aaff..53cc35590d 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -11,6 +11,6 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies - is used instead (`git-merge-resolve` when merging a single + is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). |