diff mercurial/ancestor.py @ 11990:5ebf8afbdc5c

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 19 Aug 2010 11:51:30 -0500
parents 67bb9d78f05e
children 4f8067c94729
line wrap: on
line diff