diff mercurial/ui.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 9881abfc0e44
children ca0d02222d6a
line wrap: on
line diff