tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Mon, 08 Oct 2007 18:47:17 -0500
changeset 5426 e760cb72c02e
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
osutil: simplify DT_REG support

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