493 f = self._repo.vfs('merge/' + hash) |
493 f = self._repo.vfs('merge/' + hash) |
494 wctx[dfile].write(f.read(), flags) |
494 wctx[dfile].write(f.read(), flags) |
495 f.close() |
495 f.close() |
496 else: |
496 else: |
497 wctx[dfile].remove(ignoremissing=True) |
497 wctx[dfile].remove(ignoremissing=True) |
498 complete, r, deleted = filemerge.premerge(self._repo, self._local, |
498 complete, r, deleted = filemerge.premerge(self._repo, wctx, |
499 lfile, fcd, fco, fca, |
499 self._local, lfile, fcd, |
|
500 fco, fca, |
500 labels=self._labels) |
501 labels=self._labels) |
501 else: |
502 else: |
502 complete, r, deleted = filemerge.filemerge(self._repo, self._local, |
503 complete, r, deleted = filemerge.filemerge(self._repo, wctx, |
503 lfile, fcd, fco, fca, |
504 self._local, lfile, fcd, |
|
505 fco, fca, |
504 labels=self._labels) |
506 labels=self._labels) |
505 if r is None: |
507 if r is None: |
506 # no real conflict |
508 # no real conflict |
507 del self._state[dfile] |
509 del self._state[dfile] |
508 self._stateextras.pop(dfile, None) |
510 self._stateextras.pop(dfile, None) |