view tests/test-586 @ 4924:ad09ce1d393c

convert/subversion.py: escape quotes to make code readable in Emacs
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 17 Jul 2007 13:08:50 -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