diff options
| author | Daniel Hahler <git@thequod.de> | 2015-03-20 02:11:40 +0100 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-04-10 16:24:42 +0000 |
| commit | ca8edaba9265c5328322706a56bf664fd85e3af7 (patch) | |
| tree | 8d605bb9cea9a465c767d42b9cec8c2dccaa5e66 | |
| parent | be5f561fa4cfd2f9c705fc24bdbc096070586a74 (diff) | |
| download | zsh-ca8edaba9265c5328322706a56bf664fd85e3af7.tar.gz zsh-ca8edaba9265c5328322706a56bf664fd85e3af7.tar.xz zsh-ca8edaba9265c5328322706a56bf664fd85e3af7.zip | |
34748: completion: git: update list of builtintools
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 25 |
2 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 8872e0d9f..2bf9db50f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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, diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index cc8fa65c3..b11c83c67 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -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) |