mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-26 05:51:08 +02:00
Code Releases Activity

34748: completion: git: update list of builtintools

Browse source
This commit is contained in:
Daniel Hahler 2015-03-20 02:11:40 +01:00 committed by Daniel Shahaf
parent be5f561fa4
commit ca8edaba92
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-10 Daniel Hahler <git@thequod.de>
* 34748: Completion/Unix/Command/_git: completion: git: update
list of builtintools
2015-04-07 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 34850: Doc/zman.yo, Doc/ztexi.yo, Doc/META-FAQ.yo,

25
Completion/Unix/Command/_git
View file

@ -6534,21 +6534,28 @@ __git_diff-or-merge-tools () {
[[ $type == diff ]] && __git_config_get_regexp '^difftool\..+\.cmd$' userdifftools
__git_config_get_regexp '^mergetool\..+\.cmd$' usermergetools
builtintools=(
araxis
bc
bc3
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
gvimdiff
gvimdiff2
gvimdiff3
kdiff3
tkdiff
xxdiff
meld
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff
gvimdiff
vimdiff2
vimdiff3
gvimdiff2
emerge
ecmerge
diffuse
araxis
p4merge)
xxdiff)
builtindifftools=($builtintools kompare)
builtinmergetools=($builtintools tortoisemerge)