Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4952:8c294ee7047e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: get rid of default args for status
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Jul 2007 16:02:09 -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