diff hgeditor @ 26112:cb6cfbf21735

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Aug 2015 17:21:38 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff