tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 29 May 2007 16:42:05 +0200
changeset 4461 12e4d9524951
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hgweb: use generator to count parity of horizontal stripes for easier reading. - use web.stripes in all places and consistently - start with parity0 for lists generated in reverse (e.g. changelog)

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