From 9688a882e12a80bc94d6e34d5a4b34816990e9eb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 Dec 2005 14:04:33 -0800 Subject: Documentation: recursive is the default strategy these days. We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano --- Documentation/merge-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/merge-options.txt') 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). -- cgit v1.2.3