equal
deleted
inserted
replaced
1712 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg)) |
1712 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg)) |
1713 ms.addcommitinfo(f, {b'merged': b'yes'}) |
1713 ms.addcommitinfo(f, {b'merged': b'yes'}) |
1714 progress.increment(item=f, total=numupdates) |
1714 progress.increment(item=f, total=numupdates) |
1715 ms.resolve(f, wctx) |
1715 ms.resolve(f, wctx) |
1716 |
1716 |
|
1717 except error.InterventionRequired: |
|
1718 # If the user has merge.on-failure=halt, catch the error and close the |
|
1719 # merge state "properly". |
|
1720 pass |
1717 finally: |
1721 finally: |
1718 ms.commit() |
1722 ms.commit() |
1719 |
1723 |
1720 unresolved = ms.unresolvedcount() |
1724 unresolved = ms.unresolvedcount() |
1721 |
1725 |