diff hgmerge @ 3706:0d810798acb1

Use 'bundletype' instead of 'type' to not shadow built-in function.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Nov 2006 22:33:57 +0100
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff