tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 07 Jul 2007 20:52:31 +0200
changeset 4836 035489f60842
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Use a prefix for debuginstall tempfiles. This way you know where the files came from if they don't get removed.

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