view tests/test-merge3 @ 776:7635a3f14ad4

Add template to mktemp call Based on a patch from Soh Tk-r28629
author mpm@selenic.com
date Tue, 26 Jul 2005 19:27:05 -0800
parents 7e4843b7efd2
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

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