Mercurial > hg

view tests/test-586 @ 5940:7b222815a462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 25 Jan 2008 20:17:48 +0100
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