On 11/30/21 12:29 AM, Martin von Zweigbergk via Mercurial-devel wrote:
Hi,
Just a heads up that
Thanks for the heads up !
I will work on teaching the merge machinery to call external merge
tools to let them partially resolve a merge. That will require a
different protocol for interacting with the merge tool. We're going to
pass the merge tool 3 inputs and expect 3 possibly modified
outputs, instead of just a single output the way existing merge tools
work. That way they can leave conflicts in a conflict-marker-agnostic way.
The feature seems a great idea. This is somewhat related to the
"premerge" option that mergetools currently have ( see hg help
config.merge-tools.premerge ). Except more than just the internal option
will be available.
What do you plan in terms of user interface/config for this ? It would
be nice if it the result feels like it extend the `premerge` option
smoothly.
I assume you will want to be able to configure the pre-merge tools
according to the file pattern, and mostly "regardless" of end user merge
tool of choice. What's your thoughts here ?
Cheers,
--
Pierre-Yves David
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
