summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-12-19 14:58:20 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-19 16:32:18 -0800
commitc6b4fa96cbb65036b36e19b4dd61c7030e457327 (patch)
treebb926940434746ce4765654d37d6f6ee43d9b374 /git-cvsserver.perl
parent8336afa563fbeff35e531396273065161181f04c (diff)
downloadgit-c6b4fa96cbb65036b36e19b4dd61c7030e457327.tar.gz
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>
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 2a8447e253..df395126b8 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -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 )