diff mercurial/filemerge.py @ 15974:cd4504d26695 stable

merge with i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 23 Jan 2012 16:11:37 -0200
parents e86dd8dfdea0
children 83925d3a4559 b605448eb254
line wrap: on
line diff