Mercurial > public > mercurial-scm > hg-stable

diff mercurial/debugcommands.py @ 48590:12ac4401ff7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: simplify and rename `render_markers()` `render_markers()` now always renders minimized 2-way markers, so let's simplify and rename it accordingly. Differential Revision: https://phab.mercurial-scm.org/D11979
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 11 Jan 2022 21:56:27 -0800
parents 2dbee604a4f0
children b4bc9c4f925d
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Tue Jan 11 16:23:10 2022 -0800
+++ b/mercurial/debugcommands.py	Tue Jan 11 21:56:27 2022 -0800
@@ -273,7 +273,8 @@
                         ]
                         m3 = simplemerge.Merge3Text(base, local, other)
                         ml = [
-                            l.strip() for l in simplemerge.render_markers(m3)[0]
+                            l.strip()
+                            for l in simplemerge.render_minimized(m3)[0]
                         ]
                         ml.append(b"")
                     elif at > 0: