tests/test-merge3
author kyle@zeus.moffetthome.net
Fri, 24 Jun 2005 20:53:51 -0500
changeset 463 ea93402b81b9
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Added stdint.h include to fix build on Mac OS X Tiger [v10.4]

#!/bin/sh -x

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