diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 1b23fa150b7dd8af9850af71382e78c1a21c7321..a9805dd5119540df40cd08b27d9de35909e1fffc 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
# Read .git/FETCH_HEAD and make a human readable merge message
# by grouping branches and tags together to form a single line.
-BEGIN { unshift @INC, '@@INSTLIBDIR@@'; }
+BEGIN {
+ unless (exists $ENV{'RUNNING_GIT_TESTS'}) {
+ unshift @INC, '@@INSTLIBDIR@@';
+ }
+}
use strict;
use Git;
use Error qw(:try);