# HG changeset patch # User Thomas Arendsen Hein # Date 1139465645 -3600 # Node ID 33d09f4a6fef4acf17766b64368903ad3a77ccee # Parent 20b621154e17c1c3538c57457f46327056bd9b8f Put the empty line in commit text above the branch merge line. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -437,10 +437,10 @@ class localrepository(object): 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: