equal
deleted
inserted
replaced
308 flags = flo |
308 flags = flo |
309 # restore local |
309 # restore local |
310 f = self._repo.vfs('merge/' + hash) |
310 f = self._repo.vfs('merge/' + hash) |
311 self._repo.wwrite(dfile, f.read(), flags) |
311 self._repo.wwrite(dfile, f.read(), flags) |
312 f.close() |
312 f.close() |
313 complete, r = filemerge.filemerge(self._repo, self._local, lfile, fcd, |
313 complete, r = filemerge.premerge(self._repo, self._local, lfile, fcd, |
314 fco, fca, labels=labels) |
314 fco, fca, labels=labels) |
|
315 if not complete: |
|
316 complete, r = filemerge.filemerge(self._repo, self._local, lfile, |
|
317 fcd, fco, fca, labels=labels) |
315 if r is None: |
318 if r is None: |
316 # no real conflict |
319 # no real conflict |
317 del self._state[dfile] |
320 del self._state[dfile] |
318 self._dirty = True |
321 self._dirty = True |
319 elif not r: |
322 elif not r: |