# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1407960418 18000
# Node ID 44d6818b9cd9db2c209a09dd162ef2fd745271e8
# Parent  b7c9f07b76c17573ef76d0727f1bf14e50139a9a# Parent  90c8b36d1a2e7af6d2680da9b4582f19f8e101eb
merge with stable

diff -r b7c9f07b76c1 -r 44d6818b9cd9 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