comparison mercurial/config.py @ 27329:944af8e2eb4c

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Dec 2015 17:45:19 -0600
parents a027a0813b44
children e70c97cc9243
comparison
equal deleted inserted replaced
27328:96dc6664fa9c 27329:944af8e2eb4c