( )⚙ D12149 filemerge: when not keeping premerge, don't write markers to context

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: when not keeping premerge, don't write markers to context
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Summary

When premerge is enabled (as it is for non-binary inputs by default)
and the markers are not kept, we currently still write it to the
output context and then restore the previous content right after. With
the refactoring in the previous patch, we can easily avoid that step
and instead write the output in the opposite case (i.e. when it's
successful or when the markers are supposed to be kept).

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.