comparison mercurial/ancestor.py @ 18531:8caf566f4910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:23:37 -0600
parents f7f8159caad3
children 2f7186400a07
comparison
equal deleted inserted replaced
18526:9409aeaafdc1 18531:8caf566f4910