Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43

Clean-up code that handles combinations of incompatible options.

* rs/i18n-cannot-be-used-together:
  i18n: factorize even more 'incompatible options' messages

diff --cc builtin/clone.c
Simple merge

diff --cc parse-options.c
Simple merge

diff --cc revision.c
Simple merge