tests/test-586
author Matt Mackall <mpm@selenic.com>
Wed, 13 Aug 2008 20:18:44 -0500
changeset 6902 93f761c25dea
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
store: drop self.encodefn

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