Merge branch 'pb/test-must-fail-is-for-git'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 78fe5b7f5c793c864614a6f1738be207eecee2c8..6721ff80fb1324ec1cf450f7b69cbf8266880035 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1552,7 +1552,7 @@ _git_merge ()
        case "$cur" in
        --*)
                __gitcomp "$__git_merge_options
-                       --rerere-autoupdate --no-rerere-autoupdate --abort"
+                       --rerere-autoupdate --no-rerere-autoupdate --abort --continue"
                return
        esac
        __gitcomp_nl "$(__git_refs)"