diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -33,7 +33,6 @@ Web:
 - hgweb: deliver static files (e.g. favicon, stylesheets)
 - hgweb personalization: timezone (display/change), display of
   features
-- hg export 240 shows -tkmerge (good), hgweb does not (bad).
 - some web servers think hgweb.cgi.[di] is a CGI script with old-http://
   (use quoting (see foo.d in Core) or document server configurations?)
 - link children in hgweb
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -208,7 +208,8 @@ class hgweb:
         date2 = self.date(change2)
 
         c, a, d, u = r.changes(node1, node2)
-        c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
+        if files:
+            c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
 
         for f in c:
             to = r.file(f).read(mmap1[f])
@@ -361,7 +362,7 @@ class hgweb:
                                 filenode = hex(mf.get(f, nullid)), file = f))
 
         def diff():
-            yield self.diff(p1, n, changes[3])
+            yield self.diff(p1, n, None)
 
         yield self.t('changeset',
                      diff = diff,