tests/test-merge3
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 23 Sep 2005 10:28:55 -0700
changeset 1329 8f06817bf266
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Allow files to be opened in text mode, even on Windows.

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