diff mercurial/filemerge.py @ 7440:d2a917b27152

Fix test breakage introduced in 07faba78cf5a
author Brendan Cully <brendan@kublai.com>
date Thu, 27 Nov 2008 11:14:43 -0800
parents 4c92d8971809
children 4a4c7f6a5912
line wrap: on
line diff