diff -r 72538f1909ec -r e84a8482c6f2 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu May 14 13:20:40 2009 -0500
+++ b/mercurial/cmdutil.py	Thu May 14 13:21:17 2009 -0500
@@ -7,7 +7,7 @@
 
 from node import hex, nullid, nullrev, short
 from i18n import _
-import os, sys, bisect, stat, errno
+import os, sys, bisect, stat, errno, re
 import mdiff, bdiff, util, templater, patch, error, encoding
 import match as _match
 
@@ -1252,6 +1252,7 @@
     olddir = os.getcwd()
     os.chdir(repo.root)
     text = repo.ui.edit("\n".join(edittext), ctx.user())
+    text = re.sub("(?m)^HG:.*\n", "", text)
     os.chdir(olddir)
 
     if not text.strip():