comparison mercurial/context.py @ 25427:d0c7ffc4c8bc

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Jun 2015 17:51:19 -0500
parents 95c271356a66
children a592a6a6f4fe
comparison
equal deleted inserted replaced
25424:69609f43c752 25427:d0c7ffc4c8bc