diff mercurial/simplemerge.py @ 12293:2ba12ffc1a32

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Sep 2010 16:21:01 -0500
parents 81c4e18c7cee
children 4f8067c94729
line wrap: on
line diff