--- a/mercurial/cmdutil.py	Mon Nov 01 17:26:08 2010 +0100
+++ b/mercurial/cmdutil.py	Sat Oct 30 12:13:52 2010 -0500
@@ -1356,7 +1356,7 @@
     olddir = os.getcwd()
     os.chdir(repo.root)
     text = repo.ui.edit("\n".join(edittext), ctx.user())
-    text = re.sub("(?m)^HG:.*\n", "", text)
+    text = re.sub("(?m)^HG:.*(\n|$)", "", text)
     os.chdir(olddir)
 
     if not text.strip():