tests/test-issue352.out
author Stuart W Marks <smarks@smarks.org>
Thu, 17 Sep 2009 22:39:38 -0700
changeset 9468 b2310903c462
parent 6138 09847b90beae
permissions -rw-r--r--
hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.

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