diff mercurial/ancestor.py @ 19236:39ea540dc154 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Thu, 23 May 2013 17:53:19 -0500
parents 3605d4e7e618
children 1e5b38a919dd
line wrap: on
line diff