diff hgeditor @ 13210:86a218df3c2b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 11:18:27 -0600
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff