diff mercurial/dirstate.py @ 13210:86a218df3c2b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 11:18:27 -0600
parents 6f011cf52f9a
children 0935ff767285
line wrap: on
line diff