Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-default @ 3022:d9b8d28c0b94
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 | 013921c753bd |
children | 9cd6578750b9 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge hg commit -mm2 echo % should fail because 1 head hg merge true