Gitfox
🌙

External Diff and Merge Tools

External diff and merge tools are available in the direct-download and Setapp versions of Gitfox. They are not available in the Mac App Store version.

Using presets

Gitfox offers preconfigured integration for the following mergetools:

To use one of the listed tools, open Gitfox → Settings → Integration and choose a Difftool or Mergetool.

The Use Directory Diff option is available for tools that support directory diffs. When Automatic is selected, Gitfox uses your Git configuration.

Opening a tool

Use Repository → Open Diff or Mergetool to open the appropriate tool for the current view. Use Open Diff or Mergetool for Selection to limit the operation to the selected files.

If the current status contains merge conflicts, Gitfox opens the configured mergetool. Otherwise it opens the configured difftool for the selected status, commit, or commit range.

Custom tool integration

If you select Automatic in your preferences, Gitfox acts like the git difftool or mergetool command and invokes the command you specified in your .gitconfig.

For example, if you wanted to configure Kaleidoscope without using a preset, it would look like this:

[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true

[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[merge]
tool = Kaleidoscope

[diff]
tool = Kaleidoscope

Gitfox will run the cmd you specified when set to Automatic.

For more information on how to specify your git.mergetool.cmd and other parameters, see:

You can also check vendor instructions for your specific mergetool.