diff mercurial/ancestor.py @ 10712:fbe138da6b38

keyword: 1 variable name for overwriting candidates
author Christian Ebert <blacktrash@gmx.net>
date Tue, 16 Mar 2010 22:28:23 +0100
parents d6512b3e9ac0
children 67bb9d78f05e
line wrap: on
line diff