tests/test-conflict
author Brendan Cully <brendan@kublai.com>
Thu, 14 Sep 2006 15:35:55 +0200
changeset 3085 dc784839516d
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
mq: add qdelete --forget option This removes an applied patch from the series and status files without popping it. It is useful when an mq patch has been applied upstream.

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