Use opendiff as a mergetool - latest version has a 3-pane view