view tests/test-merge3 @ 3830:08c169cbd9e1

Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Fri, 08 Dec 2006 12:53:51 -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"