diff hgeditor @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff