comparison mercurial/filemerge.py @ 10297:e7727a545c48

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Jan 2010 23:13:45 -0600
parents 08a0f04b56bd
children 23e608f42f2c
comparison
equal deleted inserted replaced
10296:cade47dcac2d 10297:e7727a545c48