diff mercurial/simplemerge.py @ 8257:e745063b94dd

Fix missing import from e68e149f4d44 merge
author Patrick Mezard <pmezard@gmail.com>
date Thu, 30 Apr 2009 08:38:20 +0200
parents 810ca383da9c
children bb9f13974d8e
line wrap: on
line diff