diff -r ba1ff2063edd -r 2376b4cc52d8 tests/test-mq-merge --- a/tests/test-mq-merge Sat May 01 19:24:46 2010 +0200 +++ b/tests/test-mq-merge Sat May 01 19:24:49 2010 +0200 @@ -28,7 +28,7 @@ hg qrefresh -m "rm a" # Save the patch queue so we can merge it later -hg qsave -c -e 2>&1 | grep -v ^copy +hg qsave -c -e 2>&1 | grep -v '^copy' checkundo qsave # Update b and commit in an "update" changeset @@ -40,7 +40,7 @@ # Here, qpush used to abort with : # The system cannot find the file specified => a hg manifest -hg qpush -a -m 2>&1 | grep -v ^merging +hg qpush -a -m 2>&1 | grep -v '^merging' checkundo 'qpush -m' hg manifest