comparison mercurial/merge.py @ 25246:c18b7eb1036f stable

i18n-pt_BR: synchronized with 2664f536a97e
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Fri, 22 May 2015 11:54:43 -0300
parents 51844b8b5017
children 6eb4bdad198f
comparison
equal deleted inserted replaced
25219:2664f536a97e 25246:c18b7eb1036f