tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Sat, 02 Jun 2007 09:21:56 -0500
changeset 4476 4ef8fdf57e39
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
mq: pass a URL to clone

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