##// END OF EJS Templates
tests: fix 05210e955bef merge error in test-git-import.t
Adrian Buehlmann -
r12586:b96de59a default
parent child Browse files
Show More
@@ -351,8 +351,14 b' Move text file and patch as binary'
351 >
351 >
352 > EOF
352 > EOF
353 applying patch from stdin
353 applying patch from stdin
354
354 $ python $TESTDIR/printrepr.py < binary2
355 $ python $TESTDIR/printrepr.py < binary2
355 a
356 a
356 b
357 b
357 \x00
358 \x00
358 $ hg st --copies --change . abort: unknown revision '.echo'!
359
360 $ hg st --copies --change .
361 A binary2
362 text2
363 R text2
364
General Comments 0
You need to be logged in to leave comments. Login now