--- a/mercurial/hg.py	Tue May 17 01:07:01 2005 -0800
+++ b/mercurial/hg.py	Tue May 17 01:07:57 2005 -0800
@@ -808,7 +808,8 @@
         new.sort()
         if co == cn: cn = -1
 
-        edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new])
+        edittext = "\nHG: merge resolve\n" + \
+                   "".join(["HG: changed %s\n" % f for f in new])
         edittext = self.ui.edit(edittext)
         n = self.changelog.add(node, new, edittext, tr, co, cn)