We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a way to use other 3rd party diff programs when diffing files
The text was updated successfully, but these errors were encountered:
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.
diff.tool
However, it would be nice to allow the user to override this setting in the preferences to use standard 3rd party tools including Kaleidoscope.
Sorry, something went wrong.
I'd also vote for allow Araxis Merge as a standard for diffing and fixing conflicts.
That is a great suggestion bernfarr . We'll be sure to add support for it when we tackle this ticket.
No branches or pull requests
Add a way to use other 3rd party diff programs when diffing files
The text was updated successfully, but these errors were encountered: