Merge branch 'jc/lockfile' into next

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index af331d9c4316a56db7bd4b3cfb4f1d5d8d5f6de5..76f6246a31b86dd54ca0556f76a8511d73be8ec7 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -23,7 +23,7 @@
 use Time::Local;
 use IO::Socket;
 use IO::Pipe;
-use POSIX qw(strftime dup2 :errno_h);
+use POSIX qw(strftime dup2 ENOENT);
 use IPC::Open2;
 
 $SIG{'PIPE'}="IGNORE";