Friendlier way to choose which diff program to use

spirallab / SproutSupport

FAQs, Wiki, Issues, and Documentation related to Sprout (formerly known as GitMac)

http://sproutmacapp.com/support

5 stars 0 forks source link

Open spirallab opened 13 years ago

spirallab commented 13 years ago

Add a way to use other 3rd party diff programs when diffing files

spirallab commented 13 years ago

Currently Sprout uses whatever Diff program Git is configure to use (usually FileMerge on Mac OSX).

To configure which program Sprout to diff files add or modify the diff.tool setting in your .gitconfig or global git settings.

However, it would be nice to allow the user to override this setting in the preferences to use standard 3rd party tools including Kaleidoscope.

bernfarr commented 11 years ago

I'd also vote for allow Araxis Merge as a standard for diffing and fixing conflicts.

spirallab commented 11 years ago

That is a great suggestion bernfarr . We'll be sure to add support for it when we tackle this ticket.