Ilya Grigoriev fedbc3017f cli merge tools: allow setting diff-args=[] to disable diff formatting with a tool ...

Not setting `diff-args` is equivalent to `diff-args=["$left",
"$right"]`, which I also documented here.

I couldn't decide whether the new error should be part of
`DiffRenderError`, `DiffGenerateError`, or `MergeToolError`. Since the
treatment of diff formatters is already very different from other merge
tools, I just made it a CommandError for now.

2025-07-19 03:39:16 +00:00

119 KiB

Raw Blame History

View Raw