contrib/bash_completion
changeset 8718 3463b28681ee
parent 6232 59200a2de7bf
child 8719 b5e9ed63913b
--- a/contrib/bash_completion	Thu Jun 04 16:21:55 2009 -0500
+++ b/contrib/bash_completion	Wed Jun 03 22:54:53 2009 -0400
@@ -221,6 +221,9 @@
 	add)
 	    _hg_status "u"
 	;;
+	merge)
+	    _hg_tags
+	;;
 	commit)
 	    _hg_status "mar"
 	;;