Re: Will work on adding allowing merge tools to partially resolve conflicts

On Fri, Dec 3, 2021 at 7:23 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > On 11/30/21 12:29 AM, Martin von Zweigbergk via Mercurial-devel wrote: > > I will work on teaching the merge machinery to call external merge > > tools to let them partially resolve a merge. That will requi

Re: Will work on adding allowing merge tools to partially resolve conflicts

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 wi

Will work on adding allowing merge tools to partially resolve conflicts

Hi, Just a heads up that 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, i