tests/test-586
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 03 Nov 2008 20:41:48 +0100
changeset 7310 bd522d09d5e3
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
hgweb: move the diffs() generator into webutil

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