Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4781:62c56d8f368b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix revlog.children so the real children of the null revision can be calculated.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 03 Jul 2007 12:45:33 +0200
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