tests/test-merge3
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 23 Mar 2010 11:48:14 +0100
branchstable
changeset 10759 9f6e30a89f11
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
help: point out need for stringification

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