diff hgeditor @ 23394:b5e2128ce9e6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Nov 2014 17:30:05 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff