diff mercurial/merge.py @ 2936:21bf8929efc8

Fix qfold after recent changes
author Brendan Cully <brendan@kublai.com>
date Wed, 16 Aug 2006 19:50:50 -0700
parents 8743188f4d2e
children 545d33aa3f82
line wrap: on
line diff