Re: Looking for a helper for advanced conflicts resolution.

[Michael Heerdegen]

Sergey Organov <sorganov@gmail.com> writes:

> Hello,
>
> To aid in resolution of complex conflicts, I'd like to know if there is
> a tool in Emacs that, given diff3-style 3-way conflict output, would
> convert it into 2 simple diffs: "mine" changes from common ancestor, and
> "yours" changes from common ancestor. Does anybody know about one?

Doesn't "smerge" do that (`smerge-diff-base-upper',
`smerge-diff-base-lower', `smerge-diff-upper-lower')?

I'm using Ediff.  AFAIR Ediff can't do the analogue out of the box when
merging, but it's not hard to implement.

Michael.