mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool--lib: add support for araxis merge

Browse Source 
Araxis merge is now a built-in diff/merge tool.
This adds araxis to git-completion and updates
the documentation to mention araxis.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2009-05-24 00:24:41 +00:00
committed by Junio C Hamano
parent 4481ff048d
commit b6f0621a46
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@ -911,7 +911,7 @@ _git_diff ()
}
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
tkdiff vimdiff gvimdiff xxdiff
tkdiff vimdiff gvimdiff xxdiff araxis
"
_git_difftool ()