tests/test-simplemerge-cmd.t

--- a/tests/test-simplemerge-cmd.t	Mon Nov 08 01:41:41 2010 +0100
+++ b/tests/test-simplemerge-cmd.t	Mon Nov 08 01:41:42 2010 +0100
@@ -104,9 +104,9 @@
 
 binary file --text
 
-  $ python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/printrepr.py
+  $ python simplemerge -a -p binary-local base other 2>&1
   warning: binary-local looks like a binary file.
-  \x00local
+  \x00local (esc)
   base
   other