Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 1501:c5c4381d898b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from Hidetaka Iwai
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Nov 2005 14:19:54 -0800
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

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