X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=53cc35590debbb7e4d7dfae536be19e59d038560;hb=5ad312bedede83f63de5e69ef5e5ddff46484eae;hp=eebaf3aaffa72996ac8bdbc8e9498814cd99f506;hpb=93d69d86912c44206543f6670e93f9fc6f2f859f;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index eebaf3aa..53cc3559 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).