Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 41687757a7fdd9c09bd320b92ed7f089af00a403..9b117fd0d736615a8c4aeda742384956373d295a 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -20,6 +20,10 @@ if ($@) {
 my %extra;
 $extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
 
+# redirect stdout, otherwise the message "Writing perl.mak for Git"
+# disrupts the output for the target 'instlibdir'
+open STDOUT, ">&STDERR";
+
 WriteMakefile(
        NAME            => 'Git',
        VERSION_FROM    => 'Git.pm',