From 916ed7426422c2f203b7352d8c0654f0b1e60cbb Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Wed, 24 Oct 2018 17:29:28 +0900 Subject: 43721: _diff3: detect GNU variant correctly --- Completion/Unix/Command/_diff3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Completion/Unix/Command/_diff3') diff --git a/Completion/Unix/Command/_diff3 b/Completion/Unix/Command/_diff3 index 524507ce0..8c59d701b 100644 --- a/Completion/Unix/Command/_diff3 +++ b/Completion/Unix/Command/_diff3 @@ -3,7 +3,7 @@ local -a args ed local ign -if _pick_variant gnu=GNU unix; then +if _pick_variant gnu=GNU unix --version; then ed=( '(-m --merge -A --show-all)'{-e,--ed}'[output ed script for incorporating changes]' '(-m --merge -A --show-all)'{-E,--show-overlap}'[like -e, but bracket conflicts]' @@ -21,8 +21,8 @@ if _pick_variant gnu=GNU unix; then '(-T --initial-tab)'{-T,--initial-tab}'[make tabs line up by prepending a tab]' '--diff-program=[specify program to compare files]: : _command_names -e' \*{-L+,--label=}'[use specified label instead of file name]:label' - "$ign(-)--help[display usage information]" - "$ign(-)"{-v,--version}'[display version information]' + "$ign(- :)--help[display usage information]" + "$ign(- :)"{-v,--version}'[display version information]' ) else args=( -A "-*" ) -- cgit 1.4.1