view tests/test-586 @ 4897:4574925db5c0

Add Chris Mason's mpatch library.
The original repo is http://oss.oracle.com/mercurial/mason/mpatch

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