diff hgeditor @ 26368:0224d22ef5d8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 25 Sep 2015 23:10:47 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff