opendiff as mergetool