[PATCH 2/2] completion: Support `git mergetool --[no-]gui`

Signed-off-by: Denton Liu <redacted>
Signed-off-by: Anmol Mago <redacted>
Signed-off-by: Brian Ho <redacted>
Signed-off-by: David Lu <redacted>
Signed-off-by: Ryan Wang <redacted>
---
 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