Added diffmerge scripts to work-mac