view tests/test-586 @ 4725:cf8b8f62688a

Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694

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