diff hgeditor @ 13895:e4ffb9576b63

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 05 Apr 2011 16:11:40 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff