diff mercurial/filemerge.py @ 10489:3232dba5d521 stable

Merge with i18n
author Martin Geisler <mg@lazybytes.net>
date Tue, 16 Feb 2010 23:28:46 +0100
parents 23e608f42f2c
children 184cdb66263e
line wrap: on
line diff