Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 5443:58496354773f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:40 -0500
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"