[RESEND PATCH v3 2/3] completion: support `git mergetool --[no-]gui`

[Denton Liu]

Signed-off-by: Denton Liu <liu.den...@gmail.com>
Signed-off-by: Anmol Mago <anmolm...@gmail.com>
Signed-off-by: Brian Ho <briank...@gmail.com>
Signed-off-by: David Lu <david.l...@outlook.com>
Signed-off-by: Ryan Wang <shirui.w...@hotmail.com>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index db7fd87b6..a45b4a050 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1833,7 +1833,7 @@ _git_mergetool ()
                return
                ;;
        --*)
-               __gitcomp "--tool= --prompt --no-prompt"
+               __gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
                return
                ;;
        esac
-- 
2.19.1