diff mercurial/ancestor.py @ 8723:b4a1b9012d96

Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Sat, 06 Jun 2009 13:37:41 -0700
parents 23429ebd3f9d
children 806e6b6cb8d8 25e572394f5c
line wrap: on
line diff