comparison mercurial/ancestor.py @ 7608:560e3e882aba

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 07 Jan 2009 02:13:32 +0100
parents 532ca442b903
children 8d78fc991b71
comparison
equal deleted inserted replaced
7607:3cf85220a9f9 7608:560e3e882aba