view tests/test-merge3 @ 948:ffb0665028f0

Merge with BOS
author mpm@selenic.com
date Fri, 19 Aug 2005 16:43:30 -0800
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"