comparison mercurial/ancestor.py @ 6412:9d2983c6a965

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 30 Mar 2008 22:23:55 +0200
parents fda369b5779c
children 6b704ef9ed06
comparison
equal deleted inserted replaced
6410:644a56c7ae79 6412:9d2983c6a965