( )⚙ D12144 simplemerge: store input data in MergeInput

This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: store input data in MergeInput
ClosedPublic

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

Details

Summary

I want to be able to update the file contents for support for partial
conflict resolution. Having the text available (and later settable) on
MergeInput will enable that.

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.Feb 8 2022, 4:26 PM
Alphare accepted this revision.Feb 9 2022, 10:50 AM
This revision is now accepted and ready to land.Feb 9 2022, 10:50 AM
martinvonz retitled this revision from simplemerge: store file contents in MergeInput type to simplemerge: store input data in MergeInput.
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 32134.
This revision was automatically updated to reflect the committed changes.