From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Dec 2023 22:10:12 +0000 (-0800)
Subject: Merge branch 'rs/i18n-cannot-be-used-together'
X-Git-Tag: v2.44.0-rc0~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e223ddda5edc503e4c73c73654b5122584188f;p=thirdparty%2Fgit.git

Merge branch 'rs/i18n-cannot-be-used-together'

Clean-up code that handles combinations of incompatible options.

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

b3e223ddda5edc503e4c73c73654b5122584188f