view tests/test-586 @ 7127:9df67ee30ef5

help: better documentation intro for a few extensions
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 18 Oct 2008 16:56:39 +0200
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line source

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