Put the empty line in commit text above the branch merge line.
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 09 Feb 2006 07:14:05 +0100
changeset 1707 33d09f4a6fef
parent 1706 20b621154e17
child 1708 4fdcfedf2a19
Put the empty line in commit text above the branch merge line.
mercurial/localrepo.py
--- 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: