tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 05 Dec 2006 23:25:28 +0100
changeset 3797 2aef481ac73c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Don't report an error when closing heads during local push (issue387)

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