Added diffmerge alias to osx