comparison mercurial/dirstate.py @ 15566:7786b7dfbc46

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Nov 2011 16:35:17 -0600
parents b2fd4746414a
children 8e020155e76c
comparison
equal deleted inserted replaced
15562:a82b6038ff08 15566:7786b7dfbc46