diff hgeditor @ 20229:9720f9a849af

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 13 Jan 2014 14:33:39 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff