Mercurial > hg

view tests/test-merge5.out @ 5269:46c5e1ee8aaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for the Atom syndication format
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 16:42:17 +0200
parents fffc8a733bf9
children 4b0c9c674707
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