view tests/test-586 @ 6116:e27f39865d7e

keyword: add test for patch.diff monkey
author Christian Ebert <blacktrash@gmx.net>
date Fri, 15 Feb 2008 18:36:49 +0100
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