--- a/mercurial/commands.py	Mon Oct 17 11:37:59 2011 +0200
+++ b/mercurial/commands.py	Sun Oct 16 01:26:06 2011 +0200
@@ -2660,7 +2660,7 @@
             mstart, mend = match.span()
             linenum += body.count('\n', begin, mstart) + 1
             lstart = body.rfind('\n', begin, mstart) + 1 or begin
-            begin = body.find('\n', mend) + 1 or len(body)
+            begin = body.find('\n', mend) + 1 or len(body) + 1
             lend = begin - 1
             yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]