diff mercurial/config.py @ 25490:ad14fb602e5e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 09 Jun 2015 13:21:20 -0500
parents 3182965b3971
children 328739ea70c3
line wrap: on
line diff