Mercurial > dotfiles
comparison .zfun/_hg @ 57:0ba810271408
basic completions for hg merge
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Fri, 20 Feb 2009 14:21:41 -0600 |
parents | 1c75cab141ae |
children | e5a40e768cf8 |
comparison
equal
deleted
inserted
replaced
56:1c75cab141ae | 57:0ba810271408 |
---|---|
568 _hg_cmd_manifest() { | 568 _hg_cmd_manifest() { |
569 _arguments -s -w : $_hg_global_opts \ | 569 _arguments -s -w : $_hg_global_opts \ |
570 ':revision:_hg_tags' | 570 ':revision:_hg_tags' |
571 } | 571 } |
572 | 572 |
573 _hg_cmd_merge() { | |
574 _arguments -s -w : $_hg_global_opts \ | |
575 '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \ | |
576 '(--rev -r)'{-r,--rev}'[revision to merge]:revision:_hg_branches' \ | |
577 ':revision:_hg_branches' | |
578 } | |
579 | |
573 _hg_cmd_outgoing() { | 580 _hg_cmd_outgoing() { |
574 _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \ | 581 _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \ |
575 '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \ | 582 '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \ |
576 '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ | 583 '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ |
577 '(--patch -p)'{-p,--patch}'[show patch]' \ | 584 '(--patch -p)'{-p,--patch}'[show patch]' \ |