tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 28 Oct 2006 20:21:54 -0300
changeset 3572 fe03c9a476f6
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
log speedup: use only ui.write in changeset_printer.show - ui.status is not very useful, since this code is never executed when ui.quiet is true. - explicitly checking for ui.debug allows a regular hg log to run without looking at the manifest index - the calls to ui.note were converted for consistency

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