# HG changeset patch # User mpm@selenic.com # Date 1115714028 28800 # Node ID e825a68d72272076fae6a12990d8feaf50fc0d61 # Parent 42177b56b949e4b4a7fb710247bd73831e27a1b8 Fix occassional diff bug with manifests diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -89,7 +89,7 @@ class manifest(revlog): if self.listcache and len(self.listcache[0]) == len(a): return mdiff.diff(self.listcache[1], self.addlist, 1) else: - return mdiff.diff(a, b) + return mdiff.textdiff(a, b) def add(self, map, transaction, link, p1=None, p2=None): files = map.keys()