tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Dec 2006 20:08:09 +0100
changeset 3993 04d919cdf263
parent 3592 fffc8a733bf9
permissions -rw-r--r--
expanded bash_completion for transplant extension

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