diff mercurial/config.py @ 14918:ebdfdba0faaf

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Jul 2011 17:17:23 -0500
parents 5fb3cb7266e5
children 69e792cf7851
line wrap: on
line diff