equal
deleted
inserted
replaced
1595 ui.write("%40s " % hex(m[f])) |
1595 ui.write("%40s " % hex(m[f])) |
1596 if ui.verbose: |
1596 if ui.verbose: |
1597 ui.write("%3s " % (m.execf(f) and "755" or "644")) |
1597 ui.write("%3s " % (m.execf(f) and "755" or "644")) |
1598 ui.write("%s\n" % f) |
1598 ui.write("%s\n" % f) |
1599 |
1599 |
1600 def merge(ui, repo, node=None, force=None, branch=None, date=None): |
1600 def merge(ui, repo, node=None, force=None, branch=None): |
1601 """Merge working directory with another revision |
1601 """Merge working directory with another revision |
1602 |
1602 |
1603 Merge the contents of the current working directory and the |
1603 Merge the contents of the current working directory and the |
1604 requested revision. Files that changed between either parent are |
1604 requested revision. Files that changed between either parent are |
1605 marked as changed for the next commit and a commit must be |
1605 marked as changed for the next commit and a commit must be |