tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 17:40:41 -0300
changeset 4861 74f36b1027f4
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.

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