view tests/test-merge3 @ 1892:622ee75cb4c9

Directory names take precedence over symbolic names consistently. Previously this was only done for clone.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 18:05:13 +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"