Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5167:4dfe4c21dd64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 14 Aug 2007 21:36:08 +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