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.

---
 git-cvsserver.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 2a8447e..df39512 100755
@@ -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

Hi,

Ooops. I should have checked after reading 8336afa if there are more offenders. Alas, I checked now, and there seem none to be left. But everybody can see now why I try to get an all-C Git: I suck at perl.

Ciao,
Dscho

Well, I should have been more careful to begin with. My apologies.

And thanks both.