diff mercurial/simplemerge.py @ 9865:1a2bc8e55396

i18n-pt_BR: synchronized with crew 9c43089b372a
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 16 Nov 2009 14:37:31 -0200
parents b87a50b7125c
children 08a0f04b56bd
line wrap: on
line diff