Merge branch 'cb/maint-no-double-merge'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cc94ef44b2910e96b60bdf2b184c4adcf89dc2d5..80ab4e45eb108898eb80caa32684c3f1308ab3a8 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -927,7 +927,7 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
-                       tkdiff vimdiff gvimdiff xxdiff
+                       tkdiff vimdiff gvimdiff xxdiff araxis
 "
 
 _git_difftool ()