Mercurial > hg-stable

changeset 18181:c7d258cd77e5

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
author Augie Fackler <raf@durin42.com>
date Tue, 01 Jan 2013 13:18:33 -0600
parents c582a71457e5
children e6db64abfa87
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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("")