tests/test-conflict
author Brendan Cully <brendan@kublai.com>
Wed, 19 Jul 2006 07:52:16 -0700
changeset 2639 001703ec311d
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Add an option '-C|--copies' to hg status to show the source of copied files. Copied files are displayed in the form: A newname oldname

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