Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4780:8b90d763ea90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add extension to provide the 'hg children' command (with tests)
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 03 Jul 2007 12:14:25 +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