diff hgmerge @ 4798:452d171a1b39

Fixed calling the merge script and reporting errors in debuginstall (issue617)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 04 Jul 2007 09:20:56 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff