diff mercurial/merge.py @ 3336:1b6d0fa84e0d

ui.py: use correct parentui while copying readhooks
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 10 Oct 2006 18:43:20 -0300
parents 39fd6e82ea38
children 8c36b33a27c7
line wrap: on
line diff