view tests/test-conflict @ 8281:3e1e499db9d7

util: initialize md5 and sha1 without using extra global variables

This lets the functions skip the "if _sha1 is None" test on each call.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status