view tests/test-merge3 @ 1560:6efad1cc07de

Merge with http://hg.omnifarious.org/~hopper/mercurial
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 29 Nov 2005 18:06:23 +0100
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"