comparison mercurial/ui.py @ 16256:c655e4acaa82

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2012 16:29:13 -0500
parents ae5f92e154d3
children 329887a7074c
comparison
equal deleted inserted replaced
16253:17f179805297 16256:c655e4acaa82