--- a/mercurial/commands.py	Mon Jul 04 12:16:27 2005 -0800
+++ b/mercurial/commands.py	Mon Jul 04 12:18:58 2005 -0800
@@ -586,7 +586,7 @@
 
         text = ""
         for l in file(pf):
-            if l[:4] == "--- ": break
+            if l.startswith("--- ") or l.startswith("diff -r"): break
             text += l
 
         # parse values that exist when importing the result of an hg export