tests/test-merge3
author Brendan Cully <brendan@kublai.com>
Fri, 15 Dec 2006 11:14:55 -0800
changeset 3898 316cd5b0c940
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with main

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