tests/test-conflict
author Brendan Cully <brendan@kublai.com>
Wed, 18 Oct 2006 10:37:34 -0700
changeset 3465 2d35a8d2b32d
parent 2283 e506c14382fd
child 4365 46280c004f22
permissions -rwxr-xr-x
patch: return list of modified files even when an exception is raised The file list is passed in as an argument and updated in place. This fixes issue399.

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