Graphical 2-way diff/merge tool