@Seb - I agree that aspect of p4merge integration is less then ideal, but for real-world (complex) conflicts it really is the only sane answer ... imho of course :). Maybe one day they'll reconsider, who knows... UI is one of those "different strokes for different folks" equations after all.

@Thomas - thanks for taking the time explain your POV and (as I mentioned) I love the product overall.

Indeed they can be arranged and it seems to remember that arrangement so +1 there... but it is now a more cluttered (imho) 6-way merge view instead of just 4... As top-level windows it is quite hard to adjust their relative arrangement on-the-fly... say to give more or less room to the working tree. In my mock up there would be an implied splitter to easily adjust the top/bottom half.

Like all UI/UX ... everyone has different preferences / sensibilities. One size does not fit all.. etc :) In this case, I certainly didn't originate the 4-way view there... so plenty of other people and products have found it useful. If you haven't tried p4merge it is a free tool (and a bit clunky) that provides that same 4-way merge view and I would love to stop using it :)

Just my $2e-02

I think once you find yourself in a 3-way merge conflict "easy-to-understand" may not be the best filter :) Also, an option for this does not mean everyone has to use it... but when you really need to look at the base-vs-left-right *and* edit the merge result (which is often in my experience) this view is unbeatable. imho etc :)

I'll stick with p4merge then since it has almost exactly the mock up view I posted there, but I thanks for the reply. Overall, I love the product btw keep up the good work!

And I'd echo what others said... ideally a button on the toolbar to toggle this vs other n-way views

I'm looking for something more like this: