comparison hgext/extdiff.py @ 20818:c7d543eebe1a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Mar 2014 17:20:56 -0500
parents 2aafd5854243
children 29eeaa6d662f
comparison
equal deleted inserted replaced
20814:8532f5e1b9df 20818:c7d543eebe1a