VCS Integration

To integrate GumTree with VCSs, you first have to place the gumtree executable (either gumtree on Linux and Mac OS or gumtree.bat on Windows) in your path.

Git integration

To use GumTree within git you can use the following command :

git difftool -x gumtree webdiff --d (by replacing gumtree by the name of the executable on your system)

You can also set gumtree as the default external diff tool by adding this content in ~/.gitconfig :

[diff]
tool = gumtree

[difftool "gumtree"]
cmd = gumtree webdiff $LOCAL $REMOTE

and then use git difftool -d.

You can also integrate our Docker container with git, see more information on the README of our Dockerfile.

Jujutsu AKA jj

For jj, I had luck with the following config in MacOS/ARM.

Docker

[merge-tools.gumtree-docker]
program="docker"
diff-args = ["run", "--platform", "linux/amd64", "-v", "./$left:/diff/left", "-v", "./$right:/diff/right",
             "-p", "4567:4567", "gumtreediff/gumtree", "webdiff", "left/", "right/",]

Then, you can do e.g. jj diff --tool gumtree-docker.

Notes:

• On the first run, it will take a while to load the 1GB+ image. If a pager is interfering with the process, try waiting, or try jj diff --tool gumtree-docker.
• There is currently no "linux/arm" image, unfortunately. My experiment used https://orbstack.dev/, I have not tested this on Docker Desktop or Colima (but hopefully it works the same).

Non-Docker

TODO