Re: Looking for a helper for advanced conflicts resolution.

[Sergey Organov]

Michael Heerdegen <michael_heerdegen@web.de> writes:

> Sergey Organov <sorganov@gmail.com> writes:
>
>> Yeah, that was my first candidate, and I've tried to invoke it from
>> magit, but it doesn't seem indeed to have the feature. Implementing it
>> probably is not a big deal indeed [...]
>
> I did implement that but haven't yet packaged it.

Thanks for letting know it's coming! Exactly as it should be for
Swiss-army knife of merging and diffing.

-- Sergey