Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5357:4ad2a18aff42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix a few residual bugs in darcs importer
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 02 Oct 2007 21:00:38 -0700
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