Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 46517:62a0b5daa15f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: suppress `merging foo` output lines when performing a merge diff Differential Revision: https://phab.mercurial-scm.org/D9939
author Augie Fackler <augie@google.com>
date Mon, 01 Feb 2021 11:57:18 -0500
parents 1a7d12c82057
children d57e607d9e33
line wrap: on
line diff
--- a/mercurial/commands.py	Thu May 07 16:50:26 2020 -0400
+++ b/mercurial/commands.py	Mon Feb 01 11:57:18 2021 -0500
@@ -2576,7 +2576,9 @@
                 },
                 b'diff --merge',
             ):
+                repo.ui.pushbuffer()
                 mergemod.merge(pctx2, wc=wctx)
+                repo.ui.popbuffer()
             ctx1 = wctx
         else:
             ctx1 = ctx2.p1()