Looking for a helper for advanced conflicts resolution.

[Sergey Organov <sorganov@gmail.com>]

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?

I.e., given:

<<<<<<< A
lines from A
||||||| B
lines from B
=======
lines from C
>>>>>>> C

Produce:

1. diff of "lines from B" and "lines from A"
2. diff of "lines from B" and "lines from C"

For example, I'd like to be able to select the chunk in the buffer, and
call a function that'd create another buffer with these 2 diffs.

Thanks,
-- Sergey