view tests/test-586 @ 5356:b98c377b3c16

Merge with crew.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 02 Oct 2007 13:49:36 -0700
parents 720ae5085ee3
children
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