tests/test-586
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Jun 2007 22:38:57 +0200
changeset 4730 eadfaa9ec487
parent 4536 720ae5085ee3
permissions -rwxr-xr-x
Updated command tables in commands.py and hgext extensions. - Marked for translation where extensions already had _() - Corrected indentation - fixed a few synopsises

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