view tests/test-issue352.out @ 5340:ad8783fe20f7

darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents 08d31e43592a
children
line wrap: on
line source

adding he
llo
abort: '\n' and '\r' disallowed in filenames
adding he
llo
abort: '\n' and '\r' disallowed in filenames
adding hell
o
abort: '\n' and '\r' disallowed in filenames
adding hell
o
abort: '\n' and '\r' disallowed in filenames
f  he
llo  he
llo
f  hell
o  hell
o