diff hgeditor @ 13965:ac1c75a7c6b5

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 20 Apr 2011 12:44:32 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff