mercurial/logcmdutil.py

47436:6ecd0980d7f9

                    b"forcemerge",
                ): b"internal:merge3-lie-about-conflicts",
            },
            b"merge-diff",
        ):
            repo.ui.pushbuffer()
            merge.merge(ctx.p2(), wc=wctx)
            repo.ui.popbuffer()
        return wctx
    else:
        return ctx.p1()

47437:7a430116f639

                    b"forcemerge",
                ): b"internal:merge3-lie-about-conflicts",
            },
            b"merge-diff",
        ):
            with repo.ui.silent():
                merge.merge(ctx.p2(), wc=wctx)
        return wctx
    else:
        return ctx.p1()