diff hgext/extdiff.py @ 15763:d730f8608b3a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jan 2012 14:06:24 -0600
parents a95efd378641
children 55174ab81973
line wrap: on
line diff