tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Fri, 11 Aug 2006 10:57:42 -0500
changeset 2852 046a8b03ea59
parent 1933 7544700fd931
permissions -rwxr-xr-x
Change remaining users of manifest flags

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