--- a/mercurial/context.py	Tue Jul 14 20:24:16 2009 +0200
+++ b/mercurial/context.py	Mon Jul 13 09:50:26 2009 +0900
@@ -443,7 +443,7 @@
                         del hist[p]
             hist[f] = curr
 
-        return zip(hist[f][0], hist[f][1].splitlines(1))
+        return zip(hist[f][0], hist[f][1].splitlines(True))
 
     def ancestor(self, fc2):
         """