mercurial/localrepo.py

--- a/mercurial/localrepo.py	Tue Apr 20 11:17:01 2010 +0200
+++ b/mercurial/localrepo.py	Wed Apr 21 01:18:31 2010 +0200
@@ -852,8 +852,7 @@
                     raise util.Abort(_("unresolved merge conflicts "
                                                     "(see hg resolve)"))
 
-            cctx = context.workingctx(self, (p1, p2), text, user, date,
-                                      extra, changes)
+            cctx = context.workingctx(self, text, user, date, extra, changes)
             if editor:
                 cctx._text = editor(self, cctx, subs)
             edited = (text != cctx._text)