tests/test-conflict
author Will <will@glozer.net>
Wed, 16 Nov 2005 20:53:16 +0100
changeset 1548 18f3224da392
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

#!/bin/sh

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