D399: filemerge: eliminate most uses of tempfiles

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  Seems like you missed two places. Let me know if should fix them in flight

INLINE COMMENTS

> filemerge.py:426
>      tool, toolpath, binary, symlink = toolconf
>      a, b, c, back = files
>      r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,

why not change here too?

> filemerge.py:472
>      """
>      a, b, c, back = files
>  

and "b, c, back" seem unused here

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D399

To: phillco, #hg-reviewers
Cc: martinvonz, lothiraldan, mercurial-devel