merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 13 Aug 2014 15:06:58 -0500
changeset 22145 44d6818b9cd9
parent 22144 b7c9f07b76c1 (current diff)
parent 22134 90c8b36d1a2e (diff)
child 22148 43f300a198d4
merge with stable
tests/test-run-tests.t
--- a/tests/test-run-tests.t	Wed Jun 25 17:40:41 2014 +0100
+++ b/tests/test-run-tests.t	Wed Aug 13 15:06:58 2014 -0500
@@ -159,7 +159,7 @@
 Running In Debug Mode
 ======================
 
-  $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug | grep -v pwd
+  $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug 2>&1 | grep -v pwd
   + echo SALT* 0 0 (glob)
   SALT* 0 0 (glob)
   + echo babar