diff mercurial/ancestor.py @ 13740:dcb51f156fa6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents 22565ddb28e7
children 1ffeeb91c55d
line wrap: on
line diff