diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ca519b7e49a0b2cc5104f71459fe621041382f19..df395126b86bbed4d8f785e7eccbdb091c3f888b 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
use strict;
use warnings;
+use bytes;
use Fcntl;
use File::Temp qw/tempdir tempfile/;
$log->debug("Temporary directory for merge is $dir");
- my $return = system("merge", $file_local, $file_old, $file_new);
+ my $return = system("git", "merge-file", $file_local, $file_old, $file_new);
$return >>= 8;
if ( $return == 0 )