diff mercurial/templater.py @ 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 e21a0e12ff10
children 46c5e1ee8aaa
line wrap: on
line diff