Mercurial > hg
view tests/test-issue352.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
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