comparison mercurial/context.py @ 15543:49a5db5b10de

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Nov 2011 13:11:17 -0600
parents a84698badf0b
children 2a48422e27f6
comparison
equal deleted inserted replaced
15542:e19302598df8 15543:49a5db5b10de