Merge branch 'jc/diff' into next

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index eebaf3aaffa72996ac8bdbc8e9498814cd99f506..53cc35590debbb7e4d7dfae536be19e59d038560 100644 (file)
--- 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).