comparison hgmerge @ 2555:d6605381c6df

hg.py: move exception handling code to try to avoid hiding errors
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 02 Jul 2006 22:39:39 -0300
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
2554:8264c2034970 2555:d6605381c6df