tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 05 Jul 2007 20:39:03 +0200
changeset 4804 beb774707c52
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.

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