Re: Looking for a helper for advanced conflicts resolution.

[Michael Heerdegen <michael_heerdegen@web.de>]

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.  When you have an
ediff3 to merge, basically, all you have to do is to add bindings to
`ediff-mode-map' that call `ediff-buffers' with two of the buffers (from
`ediff-buffer-A', `ediff-buffer-B', `ediff-buffer-C',
`ediff-ancestor-buffer').  One problem is that the highlighting of the
current Ediff session gets in the way; one has to remove and later
restore it.  Another problem is that you want to be automatically guided
to the current thunk, so you have to care about this as well.  But all
of that is easy achieve.

Michael.