diff --git a/hgext/keyword.py b/hgext/keyword.py index f6369544bf851fc367db7efb1676f0cc249fa89b_aGdleHQva2V5d29yZC5weQ==..eac5c1737f794d65c0673bf28e0d73e8cfe8c417_aGdleHQva2V5d29yZC5weQ== 100644 --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -737,6 +737,8 @@ return ret def kwfilectx_cmp(orig, self, fctx): + if fctx._customcmp: + return fctx.cmp(self) # keyword affects data size, comparing wdir and filelog size does # not make sense if (fctx._filenode is None and