Mercurial > hg
comparison tests/test-git-import.t @ 12586:b96de59a2c39
tests: fix 05210e955bef merge error in test-git-import.t
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Tue, 28 Sep 2010 19:29:14 +0200 |
| parents | 05210e955bef |
| children | bb7bf43b72fb |
comparison
equal
deleted
inserted
replaced
| 12585:385fd0eee005 | 12586:b96de59a2c39 |
|---|---|
| 349 > literal 5 | 349 > literal 5 |
| 350 > Mc$`b*O5$Pw00T?_*Z=?k | 350 > Mc$`b*O5$Pw00T?_*Z=?k |
| 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 |