Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4695:c3da7b6cc975

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
purge: add the clean alias inspired by git-clean and svn-clean
author Emanuele Aina <em@nerd.ocracy.org>
date Sat, 23 Jun 2007 22:26:22 -0500
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