This screenshot shows a 3-way merge but the point I would like to show is providing intuitive buttons in the groove/gutter in the conflict resolve window. Sorry for any misunderstanding caused.
As for the intuitiveness of 3-way merge, I think it should be fine. The title of each panel shows the version, with the middle one saying "Result". The direction of arrows also shows the flow of lines.