diff hgmerge @ 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 c4d577262d00
children 6a03cff2b0f5
line wrap: on
line diff