tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Tue, 25 Oct 2005 16:31:38 -0700
changeset 1450 199bb2b4ed4a
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Add Benoit to CONTRIBUTORS

#!/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"