tests/test-conflict
author Patrick Mezard <pmezard@gmail.com>
Thu, 05 Jul 2007 20:39:03 +0200
changeset 4804 beb774707c52
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.

#!/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