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

Merge branch 'da/araxis-mergetool'

Browse Source 
* da/araxis-mergetool:
  mergetool--lib: add support for araxis merge
This commit is contained in:
Junio C Hamano
2009-06-13 12:47:08 -07:00
parent b8364903c3 b6f0621a46
commit 1bbc820414
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

@ -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 ()