( )⚙ D11980 simplemerge: make minimize() a free function

This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: make minimize() a free function
ClosedPublic

Authored by martinvonz on Jan 12 2022, 1:55 AM.

Details

Summary

IMO, Merge3Text should be about merging text without knowing about
conflict markers. "Conflict minimization" is about making conflict
markers smaller, so it should be moved out. This patch does that. I'll
refactor it next.

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.