diff mercurial/manifest.py @ 15596:2555f441a32f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Dec 2011 01:42:03 -0600
parents 4819241ec1ad
children d976b1ef6760
line wrap: on
line diff