xxdiff is a graphical merging tool
