( )⚙ D12016 filemerge: always define a "base" label

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: always define a "base" label
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Summary

It simplifies the code and improves the conflict markers to always
have the "base" label defined.

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.

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:01 AM
This revision is now accepted and ready to land.Jan 24 2022, 5:01 AM
This revision was automatically updated to reflect the committed changes.