Preference for diff/merge tool

[avit]

Would be nice to have a way to choose a tool other than FileMerge for viewing diffs.

[Uncommon]

Such as? Each tool may have a different way to tell it what files to diff.

[avit]

From my ~/.gitconfig, these are what I use:

# Changes.app
[difftool "chdiff"]
  cmd = /usr/bin/env chdiff "$LOCAL" "$REMOTE"

# DiffMerge
[difftool "diffmerge"]
  cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge -nosplash "$LOCAL" "$REMOTE"

...Also for merge resolution (git mergetool) but I don't think that's relevant here unless there's an upcoming feature for that.