Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4599:88fc92b0b821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: page patchbomb messages only if PAGER is defined. Paging is complicated under win32. It is just better to avoid it by default.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 17 Jun 2007 20:35:43 +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