Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: add quick-install-doc for installing pre-built manpages
[gitweb.git]
/
git-cvsserver.perl
diff --git
a/git-cvsserver.perl
b/git-cvsserver.perl
index 2a8447e2534e93b4cec4e86c2dcbadfede99208a..df395126b86bbed4d8f785e7eccbdb091c3f888b 100755
(executable)
--- 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 )