Page MenuHomePhabricator

filemerge: make `_filemerge()` do both premerge and merge
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Summary

This patch removes the premerge argument from _filemerge() and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.