tests/test-586
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 19 Oct 2008 12:34:34 +0200
changeset 7165 89431fbe0524
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
Fix test-notify output for older diffstat versions.

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A