Merge branch 'sm/show-superproject-while-conflicted'

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index dba96fff0aecef6eac83aacdaa54b46806cdb0a4..bfb4fb67a13f4530aae2d974e579b9ba45e20cdb 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -18,7 +18,7 @@ BEGIN
 
 sub __bootstrap_locale_messages {
        our $TEXTDOMAIN = 'git';
-       our $TEXTDOMAINDIR = $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
+       our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
 
        require POSIX;
        POSIX->import(qw(setlocale));