view tests/test-issue352.out @ 4264:bda63383d529

Make import opportunistically use merge information
author Brendan Cully <brendan@kublai.com>
date Wed, 21 Mar 2007 14:06:25 -0700
parents 08d31e43592a
children 09847b90beae
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