summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-08 22:04:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 22:04:33 (GMT)
commit9688a882e12a80bc94d6e34d5a4b34816990e9eb (patch)
tree398cd1730afa1cb807d4b1dbcd68803724d37cdf /Documentation/merge-options.txt
parent49ccb0877f64308662669a09db7b221419c13d0a (diff)
downloadgit-9688a882e12a80bc94d6e34d5a4b34816990e9eb.zip
git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.gz
git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.bz2
Documentation: recursive is the default strategy these days.
We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index eebaf3a..53cc355 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).