This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: split out function for rendering :merge3 conflict markers
ClosedPublic

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

Details

Summary

The results in some duplicate, but the code is very straight-forward
and I think it's worth it to have each conflict marker style in a
separate function.

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.