tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 14:51:41 +0100
changeset 795 cd0ad12d9e42
parent 749 7e4843b7efd2
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Remove usage of ${par:-word}, which and mktemp. Quote filenames.

#!/bin/sh -x

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"