tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Fri, 06 Jul 2007 09:15:17 -0700
changeset 4832 4f86c58c6c56
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.

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