Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4685:b5bbfa18daf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jun 2007 20:22:17 +0200
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