diff hgeditor @ 24592:d7cf8102bf09

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Apr 2015 16:51:00 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff