Mercurial > hg-stable
changeset 78:85f1f87dc8ff
Add "HG: merge resolve" to editor text for merge
| author | mpm@selenic.com |
|---|---|
| date | Tue, 17 May 2005 01:07:57 -0800 |
| parents | bed15e766511 |
| children | 837d473d54d5 |
| files | mercurial/hg.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
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)