view tests/test-586 @ 5018:c7623d2b2a66

convert: get rid of ugly use of hasattr
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Jul 2007 13:36:53 -0700
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