From: Junio C Hamano Date: Mon, 18 Dec 2023 22:10:12 +0000 (-0800) Subject: Merge branch 'rs/i18n-cannot-be-used-together' X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=b3e223ddda5edc503e4c73c73654b5122584188f;p=rit 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