diff hgext/blackbox.py @ 23152:b8f6d840d3ec

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 03 Nov 2014 16:56:32 -0600
parents 6d6f148cada9
children 7cc77030c557
line wrap: on
line diff