diff mercurial/simplemerge.py @ 15977:c2e6c5ef4555 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Jan 2012 17:17:37 -0600
parents 7de7630053cb
children 525fdb738975
line wrap: on
line diff