Added support for DiffMerge on Mac

Added support for DiffMerge on Mac
Automatically configures git to use DiffMerge by default, but can be disabled with attributes