diff mercurial/merge.py @ 12774:642afc8f50e7

cmdutil: mark string for i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Wed, 20 Oct 2010 12:29:41 -0200
parents 62c8f7691bc3
children 9e7e24052745 c19b9282d3a7
line wrap: on
line diff