Mercurial > public > mercurial-scm > hg

diff mercurial/debugcommands.py @ 52642:73ab542565e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pyupgrade: run the `unpack_list_comprehension` fixer This probably doesn't matter much, but it reduces the noise when running the tool in the future.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 05 Jan 2025 22:12:02 -0500
parents 0e11e532c958
children d903647abbd3
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Sun Jan 05 22:00:40 2025 -0500
+++ b/mercurial/debugcommands.py	Sun Jan 05 22:12:02 2025 -0500
@@ -277,9 +277,9 @@
                     if len(ps) > 1:
                         p2 = repo[ps[1]]
                         pa = p1.ancestor(p2)
-                        base, local, other = [
+                        base, local, other = (
                             x[fn].data() for x in (pa, p1, p2)
-                        ]
+                        )
                         m3 = simplemerge.Merge3Text(
                             base,
                             local,