Mergiraf

Mergiraf is a "syntax-aware git merge driver for a growing collection of programming languages and file formats", and it can be used as a merge tool with jj version 0.24.0 or higher and Mergiraf version 0.4.0 or higher.

To configure Mergiraf as a merge tool for jj resolve, add the following snippet to your jj configuration:

[merge-tools.mergiraf]
program = "mergiraf"
merge-args = ["merge", "$base", "$left", "$right", "-o", "$output"]
merge-conflict-exit-codes = [1]
conflict-marker-style = "git"