tests/test-conflict
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 14 May 2006 21:07:34 -0700
changeset 2283 e506c14382fd
parent 1933 7544700fd931
child 4365 46280c004f22
permissions -rwxr-xr-x
deprecate 'update -m'. use 'merge' instead.

#!/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"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status