diff mercurial/config.py @ 13210:86a218df3c2b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 11:18:27 -0600
parents 3da456d0c885
children 53db4e2026ab
line wrap: on
line diff