comparison contrib/simplemerge @ 12085:6f833fc3ccab

Consistently import foo as foomod when foo to avoid shadowing This is in the style of 5f091fc1bab7.
author Martin Geisler <mg@aragost.com>
date Mon, 30 Aug 2010 14:38:24 +0200
parents bb9f13974d8e
children 659f34b833b9
comparison
equal deleted inserted replaced
12084:ff7c1118a83a 12085:6f833fc3ccab