tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Jun 2007 16:00:40 +0200
changeset 4471 736e49292809
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
addremove: comparing two empty files caused ZeroDivisionError (found by Giorgos Keramidas)

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