tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Jun 2007 08:06:37 +0200
changeset 4633 ff7253a0d1da
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Cleanup of whitespace, indentation and line continuation.

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