Merge branch 'js/t3404-typofix'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c01cfa659529b1fc69026fea790725a0f91c9731..3ff0393507c5ab25f06195b1fdca4bd7bd59770a 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -13,8 +13,7 @@ SYNOPSIS
        [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
        [--[no-]allow-unrelated-histories]
        [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
-'git merge' --abort
-'git merge' --continue
+'git merge' (--continue | --abort | --quit)
 
 DESCRIPTION
 -----------