This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: add support for the new "mergediff" marker style to premerge
ClosedPublic

Authored by martinvonz on Dec 14 2020, 9:37 PM.

Details

Summary

This adds support for the new "mergediff" conflict marker style to
"merge-tools.<tool>.premerge" (the new value is called
"keep-mergediff").

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.Dec 14 2020, 9:37 PM
martinvonz updated this revision to Diff 24276.Dec 15 2020, 1:00 AM

To people using the merge-tools.<tool>.premerge=keep* feature: what is the feature for? Is it so the merge tool can parse the markers? Because no current merge tools understand the new conflict style, of course. Is there another reason to have this feature (yet)?

To people using the merge-tools.<tool>.premerge=keep* feature: what is the feature for? Is it so the merge tool can parse the markers? Because no current merge tools understand the new conflict style, of course. Is there another reason to have this feature (yet)?

Ah, @spectral explained to me that they use vim (the plain editor, not vimdiff or anything) as a "merge tool", just so they get to do the conflict resolution synchronously, without getting dropped to the command line. So please proceed with reviewing this patch :)

pulkit accepted this revision.Dec 17 2020, 5:50 AM
This revision is now accepted and ready to land.Dec 17 2020, 5:50 AM