diff mercurial/merge.py @ 9488:33a6213a974e

zeroconf: code cleanup, fixing variable names to be meaningful
author Alexander Solovyov <piranha@piranha.org.ua>
date Sat, 26 Sep 2009 00:17:02 +0300
parents 4c041f1ee1b4
children ea8c207a0f78
line wrap: on
line diff