tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 05 Dec 2006 11:23:37 +0100
changeset 3789 734b1d6ba3dc
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Use python instead of shell printf with \x sequences for test-encoding. Needed e.g. to be compatible with Solaris.

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