diff hgeditor @ 25195:472a685a4961

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 May 2015 07:17:57 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff