Show More
@@ -281,6 +281,18 b' typeset -A _hg_cmd_globals' | |||||
281 | (( $#items )) && _describe -t config 'config item' items |
|
281 | (( $#items )) && _describe -t config 'config item' items | |
282 | } |
|
282 | } | |
283 |
|
283 | |||
|
284 | _hg_internal_merge_tools=( | |||
|
285 | \\:dump \\:fail \\:forcedump \\:local \\:merge \\:merge-local \\:merge-other | |||
|
286 | \\:merge3 \\:other \\:prompt \\:tagmerge \\:union | |||
|
287 | ) | |||
|
288 | ||||
|
289 | _hg_merge_tools() { | |||
|
290 | typeset -a external_tools | |||
|
291 | _describe -t internal_tools 'internal merge tools' _hg_internal_merge_tools | |||
|
292 | external_tools=(${(f)"$(_hg_cmd showconfig merge-tools | cut -d . -f 2)"}) | |||
|
293 | (( $#external_tools )) && _describe -t external_tools 'external merge tools' external_tools | |||
|
294 | } | |||
|
295 | ||||
284 | _hg_addremove() { |
|
296 | _hg_addremove() { | |
285 | _alternative 'files:unknown files:_hg_unknown' \ |
|
297 | _alternative 'files:unknown files:_hg_unknown' \ | |
286 | 'files:missing files:_hg_missing' |
|
298 | 'files:missing files:_hg_missing' | |
@@ -416,7 +428,7 b' typeset -A _hg_cmd_globals' | |||||
416 | '--nodates[omit dates from diff headers]') |
|
428 | '--nodates[omit dates from diff headers]') | |
417 |
|
429 | |||
418 | _hg_mergetool_opts=( |
|
430 | _hg_mergetool_opts=( | |
419 | '(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool' |
|
431 | '(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool:_hg_merge_tools' | |
420 | ) |
|
432 | ) | |
421 |
|
433 | |||
422 | _hg_dryrun_opts=( |
|
434 | _hg_dryrun_opts=( |
General Comments 0
You need to be logged in to leave comments.
Login now