tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 Jan 2007 22:12:38 +0100
changeset 4015 769be3c57564
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback

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