mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 01:06:09 +02:00
Code

git-cvsserver: fix breakage when calling git merge-file 

In the same vein as 8336afa563,
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>
This commit is contained in:
Eric Wong 2006-12-19 14:58:20 -08:00 committed by Junio C Hamano
parent 8336afa563
commit c6b4fa96cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-cvsserver.perl
View File

@ -946,7 +946,7 @@ sub req_update
$log->debug("Temporary directory for merge is $dir");
my $return = system("git merge-file", $file_local, $file_old, $file_new);
my $return = system("git", "merge-file", $file_local, $file_old, $file_new);
$return >>= 8;
if ( $return == 0 )