Merge branch 'js/t3404-typofix'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 926ea4f460994b44fa5667e478eed8d1d8f5ab5b..3ff0393507c5ab25f06195b1fdca4bd7bd59770a 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -82,7 +82,8 @@ invocations. The automated message can include the branch description.
 If `--log` is specified, a shortlog of the commits being merged
 will be appended to the specified message.
 
---[no-]rerere-autoupdate::
+--rerere-autoupdate::
+--no-rerere-autoupdate::
        Allow the rerere mechanism to update the index with the
        result of auto-conflict resolution if possible.