Am 21.04.24 um 20:17 schrieb Junio C Hamano: > A much simpler fix may be to declare that these two features are > imcompatible and fail the execution upfront, instead of just > silently ignoring one of the two options. It would not be *that* simple -- if we want to error out upfront we'd have to evaluate the attributes of all files (or all changed files) first to see whether they require an external diff. Reporting the incompatibility in the middle of a diff would be easier, but I don't see why we shouldn't support that combination. It takes some effort, sure, but not prohibitively much. René
