--- a/mercurial/merge.py Tue Feb 25 18:54:47 2014 -0800
+++ b/mercurial/merge.py Tue Feb 25 18:45:01 2014 -0800
@@ -186,11 +186,12 @@
def mark(self, dfile, state):
self._state[dfile][0] = state
self._dirty = True
- def resolve(self, dfile, wctx, octx):
+ def resolve(self, dfile, wctx):
if self[dfile] == 'r':
return 0
stateentry = self._state[dfile]
state, hash, lfile, afile, anode, ofile, onode, flags = stateentry
+ octx = self._repo[self._other]
fcd = wctx[dfile]
fco = octx[ofile]
fca = self._repo.filectx(afile, fileid=anode)
@@ -641,7 +642,7 @@
overwrite)
continue
audit(fd)
- r = ms.resolve(fd, wctx, mctx)
+ r = ms.resolve(fd, wctx)
if r is not None and r > 0:
unresolved += 1
else: