diff hgeditor @ 16279:531e69ff348f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 22 Mar 2012 17:08:05 -0500
parents 2b440bb8a66b
children 1aee2ab0f902
line wrap: on
line diff