Merge branch 'en/dirty-merge-fixes'

diff --git a/contrib/credential/netrc/git-credential-netrc b/contrib/credential/netrc/git-credential-netrc
index 0b9a94102ec90be0a51900113092a5177850f3dc..ebfc123ec641ddfa1bb2aaa83dab268c19083b2a 100755 (executable)
--- a/contrib/credential/netrc/git-credential-netrc
+++ b/contrib/credential/netrc/git-credential-netrc
@@ -2,7 +2,6 @@
 
 use strict;
 use warnings;
-use autodie;
 
 use Getopt::Long;
 use File::Basename;