tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sat, 09 Dec 2006 12:46:01 -0600
changeset 3843 abaa2cd00d2b
parent 3592 fffc8a733bf9
permissions -rw-r--r--
make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test

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