view tests/test-586 @ 7170:aff204c9bdd6

convert documentation: --config argument with spaces needs quoting.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Oct 2008 15:24:33 +0200
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line source

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