diff -r c582a71457e5 -r c7d258cd77e5 mercurial/commands.py
--- 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("")