tests/test-merge3
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 02 Oct 2007 13:49:36 -0700
changeset 5356 b98c377b3c16
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with crew.

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