From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Feb 2024 00:22:05 +0000 (-0800)
Subject: Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43
X-Git-Tag: v2.43.1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25e2039cf6619870bddc61d020bc5ccde85c6617;p=thirdparty%2Fgit.git

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
---

25e2039cf6619870bddc61d020bc5ccde85c6617