Merge branch 'dl/mergetool-gui-option'
[git/git.git] / contrib / completion / git-completion.bash
index 5f55607..86b8f47 100644 (file)
@@ -1822,7 +1822,7 @@ _git_mergetool ()
                return
                ;;
        --*)
-               __gitcomp "--tool= --prompt --no-prompt"
+               __gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
                return
                ;;
        esac