# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1285694954 -7200
# Node ID b96de59a2c39ca6258d5ea01bbceda766ca764ea
# Parent  385fd0eee00524733b7f500a032214b72af78937
tests: fix 05210e955bef merge error in test-git-import.t

diff -r 385fd0eee005 -r b96de59a2c39 tests/test-git-import.t
--- a/tests/test-git-import.t	Wed Sep 29 01:33:31 2010 +0200
+++ b/tests/test-git-import.t	Tue Sep 28 19:29:14 2010 +0200
@@ -351,8 +351,14 @@
   > 
   > EOF
   applying patch from stdin
+
   $ python $TESTDIR/printrepr.py < binary2
   a
   b
   \x00
-  $ hg st --copies --change .  abort: unknown revision '.echo'!
+
+  $ hg st --copies --change . 
+  A binary2
+    text2
+  R text2
+