equal
deleted
inserted
replaced
397 prunedactions[file] = action |
397 prunedactions[file] = action |
398 elif type == mergestatemod.ACTION_MERGE: |
398 elif type == mergestatemod.ACTION_MERGE: |
399 temporaryfiles.append(file) |
399 temporaryfiles.append(file) |
400 prunedactions[file] = action |
400 prunedactions[file] = action |
401 elif branchmerge: |
401 elif branchmerge: |
402 if type not in mergemod.mergeresult.NO_OP_ACTIONS: |
402 if type not in mergestatemod.NO_OP_ACTIONS: |
403 temporaryfiles.append(file) |
403 temporaryfiles.append(file) |
404 prunedactions[file] = action |
404 prunedactions[file] = action |
405 elif type == mergestatemod.ACTION_FORGET: |
405 elif type == mergestatemod.ACTION_FORGET: |
406 prunedactions[file] = action |
406 prunedactions[file] = action |
407 elif file in wctx: |
407 elif file in wctx: |