Mercurial > hg

view tests/test-586 @ 5858:e7ed5d07cc4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Fri, 11 Jan 2008 23:30:56 +0200
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