diff mercurial/dirstate.py @ 17661:67deea9c1c42

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Sep 2012 15:51:14 -0500
parents 67b8cca2f12b
children 3c775c5a6c03
line wrap: on
line diff