Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3709:38291d9c8c1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand test-commit to cover one of the recent bugs.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Wed, 22 Nov 2006 00:53: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