diff mercurial/ancestor.py @ 11550:14e90cc3a296

merge with stable
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 13 Jul 2010 22:56:01 +0900
parents 67bb9d78f05e
children 4f8067c94729
line wrap: on
line diff