view tests/test-586 @ 7004:90227c42b5f6

c0bd7d8b69ef uses  err() instead of warn() but prototype doesn't match

we might want to make warn() look more like err() in the future
to avoid this kind of problem.

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