diff mercurial/encoding.py @ 27431:8f016345e6b0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 18 Dec 2015 14:40:11 -0600
parents c2effd1ecebf
children c8d3392f76e1
line wrap: on
line diff