Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 4584:0d26e3d0eeeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make parents with a file but not a revision use working directory revision.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Jun 2007 10:58:49 -0700
parents 7544700fd931
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"