view tests/test-586 @ 6721:521c6c6f3b9b

kill some trailing spaces
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 13:12:32 +0200
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