view tests/test-issue352.out @ 8503:90f86a5330bb

commit: tidy up mergestate slightly
author Matt Mackall <mpm@selenic.com>
date Mon, 18 May 2009 17:36:24 -0500
parents 09847b90beae
children
line wrap: on
line source

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