Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] completion: git: update list of builtintools



From: Daniel Hahler <git@xxxxxxxxxx>

---
 Completion/Unix/Command/_git | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5524cb0..8b10fec 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6532,21 +6532,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)
-- 
2.3.0.149.gf3f4077.dirty



Messages sorted by: Reverse Date, Date, Thread, Author