diff hgeditor @ 26167:7187f6e923d5

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Sep 2015 18:32:17 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff