tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 01 Nov 2006 17:56:55 +0100
changeset 3607 f4c9bb4ad7b1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes