diff hgeditor @ 11717:a286a4ecbfeb

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 31 Jul 2010 18:12:50 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff