diff mercurial/ancestor.py @ 18025:b4c9164b031d stable

merge with i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 03 Dec 2012 19:37:36 -0200
parents 1ffeeb91c55d
children 0b03454abae7
line wrap: on
line diff