difftool/mergetool: add diffuse as merge and diff tool

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d3d8203171a3c7c221399dd6d79c8429c5006bcc..e099ed48ff3a37789c893ef14d3c21cbbe169835 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1174,7 +1174,8 @@ _git_mergetool ()
        --tool=*)
                __gitcomp "
                        kdiff3 tkdiff meld xxdiff emerge
-                       vimdiff gvimdiff ecmerge opendiff
+                       vimdiff gvimdiff ecmerge diffuse
+                       opendiff
                        " "" "${cur##--tool=}"
                return
                ;;