# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1235161301 21600
# Node ID 0ba810271408a197b7d2a747d7dca71c0af08565
# Parent  1c75cab141ae095d4c051ad4b31c87b0428eae76
basic completions for hg merge

diff --git a/.zfun/_hg b/.zfun/_hg
--- 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]' \