diff mercurial/ui.py @ 15847:c47d69ce5208

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 11 Jan 2012 09:27:53 -0600
parents ee112eb69d2a
children 69e792cf7851
line wrap: on
line diff