Get rid of the dependency on RCS' merge program

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ca519b7e49a0b2cc5104f71459fe621041382f19..55ff83b1a3fd90d030129aa83135889296476d27 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -945,7 +945,7 @@ sub req_update
 
             $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 )