diff mercurial/encoding.py @ 27329:944af8e2eb4c

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Dec 2015 17:45:19 -0600
parents de5ae97ce9f4
children b479fc425a81
line wrap: on
line diff