tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 21 Jun 2007 19:38:44 +0200
changeset 4669 96e096fe9e86
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hgweb_mod.archive(): Use 'key' instead of builtin 'id'.

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