Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix implicit tuple that is invalid syntax in Python3
authorAugie Fackler <raf@durin42.com>
Tue, 01 Jan 2013 13:18:33 -0600
changeset 18181 c7d258cd77e5
parent 18180 c582a71457e5
child 18182 e6db64abfa87
commands: fix implicit tuple that is invalid syntax in Python3
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Jan 01 12:58:21 2013 -0600
+++ b/mercurial/commands.py	Tue Jan 01 13:18:33 2013 -0600
@@ -1531,7 +1531,8 @@
                     if len(ps) > 1:
                         p2 = repo[ps[1]]
                         pa = p1.ancestor(p2)
-                        base, local, other = [x[fn].data() for x in pa, p1, p2]
+                        base, local, other = [x[fn].data() for x in (pa, p1,
+                                                                     p2)]
                         m3 = simplemerge.Merge3Text(base, local, other)
                         ml = [l.strip() for l in m3.merge_lines()]
                         ml.append("")
Mercurial