git-cvsserver: fix breakage when calling git merge-file
In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes the the RCS merge to git-merge-file conversion in commit e2b70087. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Dec 19, 2006 at 14:58 UTC
c6b4fa96cbb65036b36e19b4dd61c7030e457327
1 file changed
+1
-1
git-cvsserver.perl
+1
-1
@@ -946,7 +946,7 @@ sub req_update
946
947
$log->debug("Temporary directory for merge is $dir");
948
949
- my $return = system("git merge-file", $file_local, $file_old, $file_new);
949
+ my $return = system("git", "merge-file", $file_local, $file_old, $file_new);
950
$return >>= 8;
951
952
if ( $return == 0 )