tests/test-merge3
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 15:19:43 +0100
changeset 800 ec85f9e6f3b1
parent 749 7e4843b7efd2
child 808 8f5637f0a0c0
permissions -rwxr-xr-x
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

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