Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4519:5a9e767c2908

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include convert extension in packages setup (reported by Christian Ebert and Eric Hopper)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 07 Jun 2007 22:28:52 +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