tests/test-conflict
author Jesse Glick <jesse.glick@sun.com>
Mon, 03 Mar 2008 12:46:57 -0500
changeset 6204 f8a86ea7521b
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
When failing to load an extension, show where Hg tried to load it from.

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