Added support for DiffMerge (with git integration) on Mac