Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 5245:0d28d4e5fe1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:55:33 -0300
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"