tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Aug 2007 17:20:51 +0200
changeset 5161 24d306834de5
parent 1933 7544700fd931
permissions -rwxr-xr-x
merge with -stable

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