--- a/hgext/keyword.py	Thu Oct 20 22:20:31 2016 +0900
+++ b/hgext/keyword.py	Mon Oct 17 17:42:46 2016 +0200
@@ -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