changeset 48281 | 96aa3a68d3b5 |
parent 48271 | 269ff8978086 |
parent 47896 | 5228a6dc212b |
child 48414 | 8e855e9984a6 |
--- a/mercurial/merge.py Thu Oct 21 11:21:21 2021 +0200 +++ b/mercurial/merge.py Thu Oct 21 17:25:41 2021 +0200 @@ -1714,6 +1714,10 @@ progress.increment(item=f, total=numupdates) ms.resolve(f, wctx) + except error.InterventionRequired: + # If the user has merge.on-failure=halt, catch the error and close the + # merge state "properly". + pass finally: ms.commit()