D388: filemerge: extract _maketemp and _makebackup

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> filemerge.py:592-594
> +    In addition to preserving the user's pre-existing modifications to `fcd`
> +    (if any), the backup is used to undo certain a premerge, confirm a merge
> +    changed anything, and determine what line endings the new file should have.

Some words missing and/or too many in here

REPOSITORY
  rHG Mercurial

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

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