pivotal/pivotal_workstation — pull request #202 by webcoyote (2013-01-28 19:26:46+00:00)
Title: 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