tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Dec 2006 23:16:12 +0100
changeset 3754 cd25a4a1a265
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...

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