Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5267:b962f82cfd61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Atom support: replaced xhtml namespace prefix with default namespace
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 18:55:56 +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