diff mercurial/simplemerge.py @ 18531:8caf566f4910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:23:37 -0600
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff