comparison mercurial/dirstate.py @ 9940:2d0f1cde217b

Merge with stable again
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Nov 2009 21:54:47 -0600
parents e2b1de5fee04
children aec936051734 25e572394f5c
comparison
equal deleted inserted replaced
9938:2c7ea49d2512 9940:2d0f1cde217b