tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Fri, 19 Dec 2008 20:58:33 -0600
changeset 7530 3773e510d433
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
resolve: clarify and simplify help

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