tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 09 Feb 2007 03:48:28 -0200
changeset 4070 961ccb615cf7
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Handle functions as the value of a hooks.<name> config variable This should make it easier for extensions to add a hook when they're loaded.

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