Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sat, 03 Nov 2007 17:06:44 +0100
changeset 5505 8ce2dd9faa71
parent 5504 8bc73135c453 (current diff)
parent 5486 48c22c719f8c (diff)
child 5506 be20a42f27a1
Merge with crew-stable
--- a/mercurial/hgweb/hgweb_mod.py	Fri Nov 02 14:45:05 2007 -0700
+++ b/mercurial/hgweb/hgweb_mod.py	Sat Nov 03 17:06:44 2007 +0100
@@ -196,17 +196,17 @@
         for f in modified:
             to = c1.filectx(f).data()
             tn = c2.filectx(f).data()
-            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
+            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f,
                                           opts=diffopts), f, tn)
         for f in added:
             to = None
             tn = c2.filectx(f).data()
-            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
+            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f,
                                           opts=diffopts), f, tn)
         for f in removed:
             to = c1.filectx(f).data()
             tn = None
-            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
+            yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f,
                                           opts=diffopts), f, tn)
 
     def changelog(self, ctx, shortlog=False):