diff mercurial/merge.py @ 12908:7406d3b6ae37 stable

i18n-pt_BR: synchronized with b19b4c1df066
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 01 Nov 2010 16:04:15 -0200
parents 62c8f7691bc3
children 9e7e24052745 c19b9282d3a7
line wrap: on
line diff