From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 19 Dec 2006 22:58:20 +0000 (-0800)
Subject: git-cvsserver: fix breakage when calling git merge-file
X-Git-Tag: v1.5.0-rc0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6b4fa96cbb65036b36e19b4dd61c7030e457327;p=git.git

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>
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 2a8447e25..df395126b 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 )