view tests/test-merge3 @ 1874:a84829140fb1

Inherit config from real parentui and don't use ConfigParser internals. Added comments for the meaning of parentui.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 10 Mar 2006 11:06:45 +0100
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

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