view tests/test-586 @ 6025:f2335246e5c7

filemerge: wrap quotes around tool path
author Steve Borho <steve@borho.org>
date Mon, 04 Feb 2008 19:38:34 -0600
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