diff -r 6e2293f7b9f7 -r 64cd77f6f7f1 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Feb 14 13:30:17 2008 +0100
+++ b/hgkw/keyword.py	Thu Feb 14 16:11:54 2008 +0100
@@ -124,7 +124,7 @@
     # only expand if comparing against working dir
     if node2 is not None:
         kwx['templater'].matcher = util.never
-    if node1 is not None and node1 != repo.changectx().node():
+    elif node1 is not None and node1 != repo.changectx().node():
         kwx['templater'].restrict = True
     _patch_diff(repo, node1=node1, node2=node2, files=files, match=match,
                 fp=fp, changes=changes, opts=opts)