comparison hgext/extdiff.py @ 23726:d944492445fa

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Jan 2015 15:46:14 -0600
parents 9476cb62298e
children 01e5b7323a48
comparison
equal deleted inserted replaced
23725:6a81f88758aa 23726:d944492445fa