equal
deleted
inserted
replaced
438 |
438 |
439 if not text: |
439 if not text: |
440 edittext = "\n" |
440 edittext = "\n" |
441 if p2 != nullid: |
441 if p2 != nullid: |
442 edittext += "HG: branch merge\n" |
442 edittext += "HG: branch merge\n" |
443 edittext += "HG: manifest hash %s\n" % hex(mn) |
|
444 edittext += "".join(["HG: changed %s\n" % f for f in changed]) |
443 edittext += "".join(["HG: changed %s\n" % f for f in changed]) |
445 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
444 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
446 if not changed and not remove: |
445 if not changed and not remove: |
447 edittext += "HG: no files changed\n" |
446 edittext += "HG: no files changed\n" |
448 # run editor in the repository root |
447 # run editor in the repository root |