The best is a 4-way diff It you merge a file in two commits A and B, it would show version A, version B, the common ancestor, and the resulting merged file in

The best is a 4-way diff It you merge a file in two commits A and B, it would show version A, version B, the common ancestor, and the resulting merged file in four different views. xxdiff could do that.