Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/debugcommands.py
changeset 48562 12ac4401ff7d
parent 48558 2dbee604a4f0
child 48691 b4bc9c4f925d 
--- 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:
mercurial