tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 14 Mar 2008 23:51:58 +0100
changeset 6263 573534c6b540
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
adjust test-http output to non-default HGPORT, e.g. with run-tests.py -j

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