# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 2009-06-04 02:54:53
# Node ID 3463b28681eec1407816a56a24ccee54dd11abdf
# Parent  e8de59577257b2d3dbf2423397d6ab953cf57adc

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 @@ shopt -s extglob
 	add)
 	    _hg_status "u"
 	;;
+	merge)
+	    _hg_tags
+	;;
 	commit)
 	    _hg_status "mar"
 	;;