# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-06-03 22:12:48
# Node ID dd3ebf81af433e37d301b3093f7e151bb52e01f8
# Parent  1b95c6f13155faf1bf900e45aed07258c3712acb

commit: rename wctx to cctx

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -837,11 +837,11 @@ class localrepository(repo.repository):
                     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]: