tests/test-merge3
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Tue, 21 Feb 2006 15:48:19 -0600
changeset 1773 aae93c3bffb4
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
hgmerge: improve "apps not found" message

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