tests/test-simplemerge-cmd

--- a/tests/test-simplemerge-cmd	Sun May 17 01:10:35 2009 +0200
+++ b/tests/test-simplemerge-cmd	Sun May 17 01:16:56 2009 +0200
@@ -47,7 +47,7 @@
 python simplemerge -p binary-local base other
 
 echo '% binary file --text'
-python simplemerge -a -p binary-local base other
+python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py
 
 echo '% help'
 python simplemerge --help