Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add "HG: merge resolve" to editor text for merge
authormpm@selenic.com
Tue, 17 May 2005 01:07:57 -0800
changeset 78 85f1f87dc8ff
parent 77 bed15e766511
child 79 837d473d54d5
Add "HG: merge resolve" to editor text for merge
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -808,7 +808,8 @@ class localrepository:
         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)
mercurial-crew-with-dirclash