Mercurial > hg

view tests/test-merge5.out @ 6263:573534c6b540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adjust test-http output to non-default HGPORT, e.g. with run-tests.py -j
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 14 Mar 2008 23:51:58 +0100
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

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