equal
deleted
inserted
replaced
759 edittext.append(text) |
759 edittext.append(text) |
760 edittext.append("") |
760 edittext.append("") |
761 edittext.append("HG: user: %s" % user) |
761 edittext.append("HG: user: %s" % user) |
762 if p2 != nullid: |
762 if p2 != nullid: |
763 edittext.append("HG: branch merge") |
763 edittext.append("HG: branch merge") |
|
764 if branchname: |
|
765 edittext.append("HG: branch %s" % branchname) |
764 edittext.extend(["HG: changed %s" % f for f in changed]) |
766 edittext.extend(["HG: changed %s" % f for f in changed]) |
765 edittext.extend(["HG: removed %s" % f for f in removed]) |
767 edittext.extend(["HG: removed %s" % f for f in removed]) |
766 if not changed and not remove: |
768 if not changed and not remove: |
767 edittext.append("HG: no files changed") |
769 edittext.append("HG: no files changed") |
768 edittext.append("") |
770 edittext.append("") |