Put the empty line in commit text above the branch merge line.
--- a/mercurial/localrepo.py Thu Feb 09 07:01:23 2006 +0100
+++ b/mercurial/localrepo.py Thu Feb 09 07:14:05 2006 +0100
@@ -437,10 +437,10 @@
new.sort()
if not text:
- edittext = ""
+ edittext = "\n"
if p2 != nullid:
edittext += "HG: branch merge\n"
- edittext += "\n" + "HG: manifest hash %s\n" % hex(mn)
+ edittext += "HG: manifest hash %s\n" % hex(mn)
edittext += "".join(["HG: changed %s\n" % f for f in changed])
edittext += "".join(["HG: removed %s\n" % f for f in remove])
if not changed and not remove: