-
Notifications
You must be signed in to change notification settings - Fork 436
Mergiraf
Scott Taylor edited this page Mar 8, 2025
·
6 revisions
Mergiraf is a "syntax-aware git merge driver for a growing collection of programming languages and file formats".
Since jj 0.27.0, you can use jj resolve --tool mergiraf without any additional configuration required. For reference, here is the default configuration:
[merge-tools.mergiraf]
program = "mergiraf"
merge-args = ["merge", "$base", "$left", "$right", "-o", "$output", "-l", "$marker_length", "--fast"]
merge-conflict-exit-codes = [1]Currently, the --fast flag often gives the best results because the structural merge algorithm doesn't always maintain comments and spacing in the merge output (even parts without conflicts), but you can remove it if you want to use a full structural merge. Older versions of jj or Mergiraf may not support the -l $marker_length flag, so it may need to be removed if you are not using the latest versions of both tools.