diff mercurial/ancestor.py @ 4927:382520bacc17

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 18 Jul 2007 22:46:14 -0700
parents eb0b4a2d70a9
children
line wrap: on
line diff