tests/test-issue352.out
author Matt Mackall <mpm@selenic.com>
Thu, 12 Nov 2009 12:03:39 -0600
changeset 9843 d1043c2ffe6c
parent 6138 09847b90beae
permissions -rw-r--r--
merge: fix changectx.ancestor(workingctx) (issue1327)

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