// Docs

Integration

git difftool and mergetool, the file manager context menu, Subversion, Mercurial and Perforce, and the editors.

Preferences › Integration configures all of this and undoes it again: each entry says what it will write, writes it when you click “Configure”, and remembers enough to take it back out.

Git

[diff]
    tool = geecompare
[difftool "geecompare"]
    cmd = geecompare --wait --readonly "$LOCAL" "$REMOTE"

[merge]
    tool = geecompare
[mergetool "geecompare"]
    cmd = geecompare --wait "$LOCAL" "$REMOTE" "$BASE" -o "$MERGED"
    trustExitCode = true

Globally or in the current repository, your choice. --wait is what makes git wait for the window; trustExitCode lets the merge’s exit code tell git whether the conflict was resolved. Then git difftool and git mergetool open GeeCompare, and a three-way merge arrives with its base and its output file already in place.

The file manager

Right-click a file or folder and compare it. The entries are the same everywhere: compare two selected items, “Select left side”, and then “Compare to ” on the second item. The menu is registered for your user when you switch it on, and unregistered when you switch it off.

  • macOS: a Finder extension, signed and shipped inside the app.
  • Windows: an Explorer handler (gc_shell.dll), registered per user. Windows 11’s first-level menu needs a signed package; without it the entries are under “Show more options”.
  • Linux: Nautilus, Dolphin and Thunar.

Other version control

Each of these writes its own configuration, and small wrapper scripts where the tool’s argument order needs mapping (they are written into GeeCompare’s data folder):

Tool What it writes
Subversion ~/.subversion/config [helpers] diff-cmd and merge-tool-cmd, pointing at the wrappers
Mercurial ~/.hgrc (or mercurial.ini on Windows): extdiff, merge-tools and ui.merge
Perforce P4DIFF and P4MERGE in $P4ENVIRO (~/.p4enviro by default), through the wrappers
Plastic SCM, TFS Templates only: their configuration is undocumented or lives in Visual Studio’s private hive

Editors

Editor How
JetBrains IDEs Settings › Tools › Diff & Merge › External tools: the program path, and --wait %1 %2 --lefttitle=%3 --righttitle=%4
VS Code settings.json: the external diff tool and the path to geecompare

The command

“Install the geecompare command” puts geecompare on your PATH (a small launcher on macOS and Linux; on Windows the installer adds the program’s folder). Everything on the command line page then works from any terminal, and the editors above can be pointed at the plain name.

External compare and merge tools

GeeCompare can also hand a file to another program: a tool whose command line matches the file is offered in the session’s ☰ menu, and the substitutions are the usual %1, %2, %3, %4 for left, right, base and output. A merge tool’s exit code decides whether the session counts as resolved, so git mergetool --tool=geecompare can pass a binary conflict straight on to the program that knows that format.

Last updated: 2026-11-22