diff hgeditor @ 21976:3467cf39aae6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Aug 2014 18:32:52 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff