equal
deleted
inserted
replaced
1554 |
1554 |
1555 if merge and cctx.deleted(): |
1555 if merge and cctx.deleted(): |
1556 raise error.Abort(_("cannot commit merge with missing files")) |
1556 raise error.Abort(_("cannot commit merge with missing files")) |
1557 |
1557 |
1558 unresolved, driverresolved = False, False |
1558 unresolved, driverresolved = False, False |
1559 ms = mergemod.mergestate(self) |
1559 ms = mergemod.mergestate.read(self) |
1560 for f in status.modified: |
1560 for f in status.modified: |
1561 if f in ms: |
1561 if f in ms: |
1562 if ms[f] == 'u': |
1562 if ms[f] == 'u': |
1563 unresolved = True |
1563 unresolved = True |
1564 elif ms[f] == 'd': |
1564 elif ms[f] == 'd': |