Change Diff and Mergetool

1. Using Presets

We offer preconfigured integration for the following mergetools

• Kaleidoscope
• Araxis Merge
• P4Merge
• FileMerge

To use one of the listed tools, just select them under Preferences → Integration

2. Custom Mergetool Integration

If you select Automatic in your preferences, Gitfox will act like the git difftool (or mergetool) command and invoke 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 would then run the cmd you specified when set to Automatic.

For more information on how to specify your git.mergetool.cmd and other parameters, have a look at

• git-mergetool
• git-difftool

and vendor instructions for your specific mergetool.