tests/test-conflict
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 16 Jul 2007 16:50:47 -0700
changeset 4887 bbdcacf7cef8
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
mq: autodetect an existing git patch during qrefresh (issue 491)

#!/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"
hg merge 1
hg id
cat a
hg status