Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4804:beb774707c52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 05 Jul 2007 20:39:03 +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