tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Wed, 09 Aug 2006 13:55:18 -0500
changeset 2830 49988d9f0758
parent 1933 7544700fd931
permissions -rwxr-xr-x
Merge with crew, fix most tests

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