diff mercurial/simplemerge.py @ 14722:b6dc362b051c stable

match: fix bug caused by refactoring in cfc89398f710
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Thu, 23 Jun 2011 14:40:57 +0200
parents 48ec0763afbb
children 774da7121fc9
line wrap: on
line diff