##// END OF EJS Templates
merge with stable
Benoit Boissinot -
r10706:d8d1b56d merge default
parent child Browse files
Show More
@@ -59,7 +59,7 class filelog(revlog.revlog):
59 """compare text with a given file revision"""
59 """compare text with a given file revision"""
60
60
61 # for renames, we have to go the slow way
61 # for renames, we have to go the slow way
62 if self.renamed(node):
62 if text.startswith('\1\n') or self.renamed(node):
63 t2 = self.read(node)
63 t2 = self.read(node)
64 return t2 != text
64 return t2 != text
65
65
General Comments 0
You need to be logged in to leave comments. Login now