equal
deleted
inserted
replaced
1505 self.ui.status("merging %s\n" % f) |
1505 self.ui.status("merging %s\n" % f) |
1506 m, o, flag = merge[f] |
1506 m, o, flag = merge[f] |
1507 self.merge3(f, m, o) |
1507 self.merge3(f, m, o) |
1508 util.set_exec(self.wjoin(f), flag) |
1508 util.set_exec(self.wjoin(f), flag) |
1509 if moddirstate: |
1509 if moddirstate: |
1510 self.dirstate.update([f], 'm') |
1510 self.dirstate.update([f], mode) |
1511 |
1511 |
1512 remove.sort() |
1512 remove.sort() |
1513 for f in remove: |
1513 for f in remove: |
1514 self.ui.note("removing %s\n" % f) |
1514 self.ui.note("removing %s\n" % f) |
1515 try: |
1515 try: |