tests/test-586
author Matt Mackall <mpm@selenic.com>
Mon, 12 May 2008 11:37:07 -0500
changeset 6580 da2a20d2ba3d
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
walkchangerev: use new match objects

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