Mercurial > dotfiles

diff .zfun/_hg @ 57:0ba810271408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
basic completions for hg merge
author Augie Fackler <durin42@gmail.com>
date Fri, 20 Feb 2009 14:21:41 -0600
parents 1c75cab141ae
children e5a40e768cf8
line wrap: on
line diff
--- a/.zfun/_hg
+++ b/.zfun/_hg
@@ -570,6 +570,13 @@ typeset -A _hg_cmd_globals
   ':revision:_hg_tags'
 }
 
+_hg_cmd_merge() {
+    _arguments -s -w : $_hg_global_opts \
+        '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \
+        '(--rev -r)'{-r,--rev}'[revision to merge]:revision:_hg_branches' \
+        ':revision:_hg_branches'
+}
+
 _hg_cmd_outgoing() {
   _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
   '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \