3-sided merge tools for Mac that feature 4 panels

Question

I am a fan of the 4-panel approach for merging three files. In particular, having the ability to see Branch A, Branch B and the ancestor A and B in 3 read-only panels, then the 4th read-write panel, which shows the results of your merge.

However, I was unable to find a four-panel merge tool for Mac OSX that I can integrate with mercurial / git. Is there such a beast?

Answer 1

The tool you are looking for is p4merge . Git has built-in support for it.

Answer 2

My first thought was to suggest KDiff3 , as it has 4 panels for tripartite mergers and can be integrated with git (see here and here ), but from the comments you don't seem to consider this an option. I am a little surprised why, because I like KDiff3 a lot, and it fits my needs.

Answer 3

Vim!

see macvim.org