Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3754:cd25a4a1a265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 23:16:12 +0100
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