comparison hgext/extdiff.py @ 15623:fc8c7a5ccc4a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 16:01:44 -0600
parents a95efd378641
children 55174ab81973
comparison
equal deleted inserted replaced
15622:86fc364ca5f8 15623:fc8c7a5ccc4a