Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 3022:d9b8d28c0b94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Find the system's MD5 binary. Different binaries calculate MD5 checksums on different systems. Try a couple known programs and only calculate and verify the checksum if they exist. This should silence warnings on eg OpenBSD.
author Will Maier <willmaier@ml1.net>
date Fri, 28 Jul 2006 13:46:19 -0500
parents 91c56c427171
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed