tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 29 Jul 2007 19:32:55 +0200
changeset 5028 36e8983fe44d
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-convert: Hide warning about missing subversion bindings.

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