tests/test-conflict
author mpm@selenic.com
Wed, 13 Jul 2005 01:46:50 -0800
changeset 690 f762860f82c6
parent 591 eb46971fc57f
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Minor merge fixups return a proper errorlevel on abort let force jump across branches catch exception on unlink manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

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