comparison mercurial/ancestor.py @ 11717:a286a4ecbfeb

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 31 Jul 2010 18:12:50 -0500
parents 67bb9d78f05e
children 4f8067c94729
comparison
equal deleted inserted replaced
11714:aae1dd12fce6 11717:a286a4ecbfeb