tests/test-conflict
author mpm@selenic.com
Wed, 13 Jul 2005 01:48:03 -0800
changeset 691 61c6b4178b9e
parent 591 eb46971fc57f
child 749 7e4843b7efd2
permissions -rwxr-xr-x
HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810

#!/bin/sh

set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status