Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 5267:b962f82cfd61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Atom support: replaced xhtml namespace prefix with default namespace
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 18:55:56 +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