view tests/test-merge3 @ 3902:0d27502a804c

Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Fri, 15 Dec 2006 18:38:09 -0800
parents 7544700fd931
children
line wrap: on
line source

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