[PATCH 3/9] add missing long options to 'git mergetool' completion

according to the git-mergetool man page, '--no-prompt' and '--prompt' are
missing from the 'git mergetool' completion

Signed-off-by: Emmanuel Trillaud <redacted>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/completion/git-completion.bash

b/contrib/completion/git-completion.bash
index 9e86d28..f56733b 100755

--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash

@@ -1232,7 +1232,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool="
+		__gitcomp "--tool= --no-prompt --prompt"
 		return
 		;;
 	esac

-- 
1.6.4