changeset 3721 | 98f2507c5551 |
parent 3720 | 5cc99f4b5041 |
child 3733 | 9e67fecbfd16 |
--- a/mercurial/localrepo.py Tue Nov 28 19:11:46 2006 +0100 +++ b/mercurial/localrepo.py Tue Nov 28 21:16:05 2006 +0100 @@ -679,6 +679,7 @@ if text: edittext.append(text) edittext.append("") + edittext.append("HG: user: %s" % user) if p2 != nullid: edittext.append("HG: branch merge") edittext.extend(["HG: changed %s" % f for f in changed])