##// END OF EJS Templates
commit: rename wctx to cctx
Matt Mackall -
r8712:dd3ebf81 default
parent child Browse files
Show More
@@ -837,11 +837,11 b' class localrepository(repo.repository):'
837 837 raise util.Abort(_("unresolved merge conflicts "
838 838 "(see hg resolve)"))
839 839
840 wctx = context.workingctx(self, (p1, p2), text, user, date,
840 cctx = context.workingctx(self, (p1, p2), text, user, date,
841 841 extra, changes)
842 842 if editor:
843 wctx._text = editor(self, wctx)
844 ret = self.commitctx(wctx, True)
843 cctx._text = editor(self, cctx)
844 ret = self.commitctx(cctx, True)
845 845
846 846 # update dirstate and mergestate
847 847 for f in changes[0] + changes[1]:
General Comments 0
You need to be logged in to leave comments. Login now