# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1333220710 18000
# Node ID b3fefbb95aad2a9b5b8e44e6fea4860d6690368b
# Parent  d388c3fc8319d7c1fe96148fcc276ca2c861fbe3# Parent  7c76587fb3726e9ac7da5346e828313c6119f1d7
merge with stable

diff -r d388c3fc8319 -r b3fefbb95aad tests/test-mq.t
--- a/tests/test-mq.t	Sat Mar 31 14:04:39 2012 -0500
+++ b/tests/test-mq.t	Sat Mar 31 14:05:10 2012 -0500
@@ -519,7 +519,7 @@
   $ hg qpush --move test.patch # already applied
   abort: cannot push to a previous patch: test.patch
   [255]
-  $ sed -i.bak '2i# make qtip index different in series and fullseries' `hg root`/.hg/patches/series
+  $ sed -i.bak '2i\# make qtip index different in series and fullseries' `hg root`/.hg/patches/series
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries