view tests/test-586 @ 5672:8a65ea986755

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)

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