tests/test-conflict
author Patrick Mezard <pmezard@gmail.com>
Mon, 13 Aug 2007 19:42:50 +0200
changeset 5151 9374373fb727
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
util: ignore invalid path errors in path_auditor.

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