tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 22 Oct 2006 01:01:03 -0300
changeset 3475 03932425cfd8
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
bash_completion: don't complete export with "garbage" when mq is not around The "garbage" is the output of hg help printed when a command is not found.

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