diff hgeditor @ 21230:d882a8786ddf

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 06 May 2014 12:47:59 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff