diff mercurial/ancestor.py @ 14918:ebdfdba0faaf

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Jul 2011 17:17:23 -0500
parents 1ffeeb91c55d
children 0b03454abae7
line wrap: on
line diff