Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3933:ea238a4e9e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Teach hgweb about revlog.LookupError
author Brendan Cully <brendan@kublai.com>
date Tue, 19 Dec 2006 16:40:09 -0800
parents fffc8a733bf9
children
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