[merge-tools.diffedit3]program = "diffedit3"# 17376 is a verified random number, as in https://xkcd.com/221/ :). I am trying# to avoid 8000 or 8080 in case those, more commonly used, port numbers are used# for something else.## We use a random port as a fallback if all 5 of the preferred port numbers are# busy.edit-args = ["$left", "$right", "$output", "--port", "17376-17380", "--port", "0"] [merge-tools.diffedit3-ssh]program = "diffedit3"# 17376 is a verified random number, as in https://xkcd.com/221/ :). I am trying# to avoid 8000 or 8080 in case those, more commonly used, port numbers are used# for something else.## We do NOT use a random port as a fallback since we recommend that the user# configure SSH to forward these 5 portsedit-args = ["$left", "$right", "$output", "--port", "17376-17380", "--no-browser"] [merge-tools.difft]diff-args = ["--color=always", "$left", "$right"] [merge-tools.kdiff3]# --merge to open output pane, CreateBakFiles=0 to not include backup files in commitedit-args = ["--merge", "--cs", "CreateBakFiles=0", "$left", "$right"]merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"] [merge-tools.meld]edit-args = ["$left", "$right"]merge-args = ["$left", "$base", "$right", "-o", "$output", "--auto-merge"] [merge-tools.meld-3]program = "meld"# If using this as a template, note that `$output` is repeated twice belowedit-args = ["$left", "$output", "$right", "-o", "$output"] [merge-tools.mergiraf]# 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.program = "mergiraf"merge-args = ["merge", "$base", "$left", "$right", "-o", "$output", "-l", "$marker_length", "--fast"]merge-conflict-exit-codes = [1] [merge-tools.smerge]merge-args = ["mergetool", "$base", "$left", "$right", "-o", "$output"]conflict-marker-style = "git" [merge-tools.vimdiff]program = "vim"# `-d` enables diff mode. `-f` makes vim run in foreground even if it starts a GUI.# The other options make sure that only the output file can be modified.merge-args = ["-f", "-d", "$output", "-M", "$left", "$base", "$right",              "-c", "wincmd J", "-c", "set modifiable", "-c", "set write",              "-c", "/<<<<<</+2"]merge-tool-edits-conflict-markers = true# Directory diffing is barely usable in vimdiff without additional pluginsedit-args = [    "-f", "-d", "$left", "$right", "-c", "echohl WarningMsg", "-c",    'echomsg "Warning: using plain `vimdiff` as a diff editor is not recommended. See https://github.com/jj-vcs/jj/wiki/Vim for alternatives."',    "-c", "echohl None",] # if you change the settings for vscode, please do the same for vscodium[merge-tools.vscode]program = "code"merge-args = ["--wait", "--merge", "$left", "$right", "$base", "$output"]# VS Code reads the output file and behaves better if it's prepopulated with conflict# markers. Unfortunately, it does not seem to be able to output conflict markers when# the user only resolves some of the conflicts.merge-tool-edits-conflict-markers = true# VS Code prefers Git-style conflict markersconflict-marker-style = "git" # free/libre distribution of vscode, functionally more or less the same[merge-tools.vscodium]program = "codium"merge-args = ["--wait", "--merge", "$left", "$right", "$base", "$output"]merge-tool-edits-conflict-markers = trueconflict-marker-style = "git"