tests/test-conflict
author TK Soh <teekaysoh@yahoo.com>
Mon, 08 Oct 2007 11:18:34 +0800
changeset 5417 b8872655f951
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
hgk: allow any extdiff command for visual diff

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