[PATCH] git-cvsserver: fix breakage when calling git merge-file

From: Eric Wong <normalperson@yhbt.net>
Date: Dec 19, 2006, 22:58 UTC
Message-ID: <20061219225820.GA6418@soma>

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>
---
 git-cvsserver.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

-- 
1.4.4.2.ga184