--- a/mercurial/context.py	Fri Feb 23 17:57:04 2018 -0800
+++ b/mercurial/context.py	Wed Feb 21 21:14:05 2018 +0900
@@ -1121,7 +1121,8 @@
                 hist[f] = curr
                 del pcache[f]
 
-        return pycompat.ziplist(hist[base][0], hist[base][1].splitlines(True))
+        lineattrs, text = hist[base]
+        return pycompat.ziplist(lineattrs, mdiff.splitnewlines(text))
 
     def ancestors(self, followfirst=False):
         visit = {}