changeset 47437 | 7a430116f639 |
parent 47012 | d55b71393907 |
child 48014 | 0dc4cc654d96 |
--- a/mercurial/logcmdutil.py Fri Jun 18 14:17:43 2021 -0700 +++ b/mercurial/logcmdutil.py Fri Jun 18 15:48:51 2021 -0700 @@ -93,9 +93,8 @@ }, b"merge-diff", ): - repo.ui.pushbuffer() - merge.merge(ctx.p2(), wc=wctx) - repo.ui.popbuffer() + with repo.ui.silent(): + merge.merge(ctx.p2(), wc=wctx) return wctx else: return ctx.p1()