(original)

KDiff3 is a very good comparison and merging tool (You can find it at http://kdiff3.sourceforge.net/). For merging operations bewteen two branches, it allows to see the 3 source views : “base view” (or common ancestor view), “your local branch view” and the “target view”. Also, at the bottom, it displays the final result in the “merged view”. (more…)