[PATCH 1 of 2] Support merge in contrib/bash_completion

[Steve Losh]

# HG changeset patch
# User Steve Losh <steve at stevelosh.com>
# Date 1244084093 14400
# Node ID 97543e3d136830fac258e316e3ba80392f7e1d1d
# Parent  3d53820381cb368cc538c18ee2e42beda1dc20bb
Support merge in contrib/bash_completion

diff --git a/contrib/bash_completion b/contrib/bash_completion
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -221,6 +221,9 @@
 	add)
 	    _hg_status "u"
 	;;
+	merge)
+	    _hg_tags
+	;;
 	commit)
 	    _hg_status "mar"
 	;;