diff -r 1b95c6f13155 -r dd3ebf81af43 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Jun 03 17:07:41 2009 -0500
+++ b/mercurial/localrepo.py	Wed Jun 03 17:12:48 2009 -0500
@@ -837,11 +837,11 @@
                     raise util.Abort(_("unresolved merge conflicts "
                                                     "(see hg resolve)"))
 
-            wctx = context.workingctx(self, (p1, p2), text, user, date,
+            cctx = context.workingctx(self, (p1, p2), text, user, date,
                                       extra, changes)
             if editor:
-                wctx._text = editor(self, wctx)
-            ret = self.commitctx(wctx, True)
+                cctx._text = editor(self, cctx)
+            ret = self.commitctx(cctx, True)
 
             # update dirstate and mergestate
             for f in changes[0] + changes[1]: