comment out function replacing diff with git diff for coloring
revert to old style osx-defaults for merge