summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-13 12:47:08 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-13 12:47:08 -0700
commit1bbc820414d94452d1417bb83db86309f34720a3 (patch)
tree2eb3a4843174f6999a290da3e5b7c5b55173701a /contrib
parentb8364903c3e4cde713102e4a36d3926b020b0f70 (diff)
parentb6f0621a462e4ff11999c8e2d8279c0ffd3be201 (diff)
downloadgit-1bbc820414d94452d1417bb83db86309f34720a3.tar.gz
Merge branch 'da/araxis-mergetool'
* da/araxis-mergetool: mergetool--lib: add support for araxis merge
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cc94ef44b2..80ab4e45eb 100755
--- 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 ()