Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 3240:8d4855fd9d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -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"