# HG changeset patch
# User mpm@selenic.com
# Date 1116320877 28800
# Node ID 85f1f87dc8ff2820d873bae04d5ac0f9501eb0af
# Parent  bed15e766511ac9d0ae83f97131719ce144a5290
Add "HG: merge resolve" to editor text for merge



diff -r bed15e766511 -r 85f1f87dc8ff mercurial/hg.py
--- 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)