comparison mercurial/ancestor.py @ 11958:60bfb876dc45

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Aug 2010 17:44:19 -0500
parents 67bb9d78f05e
children 4f8067c94729
comparison
equal deleted inserted replaced
11957:8439a7a2d613 11958:60bfb876dc45