This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: change _minimize() to minimize a single conflict

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



_minimize() is weird in that it changes a_lines and b_lines but
leaves base_lines unchanged, which means they'll be
inconsistent. That was fine because the caller never used
base_lines. With the recent refactorings of this code, we can now
make this function cleaner by having it minimize a single conflict and
not care about base_lines.

This also makes the code simpler and makes the code for each
render_*() function more similar.

Diff Detail

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