Mercurial > hg > pyhgsh

diff mercurial/hg.py @ 78:85f1f87dc8ff

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
author mpm@selenic.com
date Tue, 17 May 2005 01:07:57 -0800
parents a182f2561c8e
children 837d473d54d5
line wrap: on
line diff
--- 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)