summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-12 23:01:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 05:47:29 (GMT)
commite2b7008752d85874919ea718d098fec01b4a9019 (patch)
tree4175a000078a2fbff6da0291faa16ea592c1281c /git-cvsserver.perl
parentfbe0b24ca53111208b8ecd920cc112d0be13f93c (diff)
downloadgit-e2b7008752d85874919ea718d098fec01b4a9019.zip
git-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz
git-e2b7008752d85874919ea718d098fec01b4a9019.tar.bz2
Get rid of the dependency on RCS' merge program
Now that we have git-merge-file, an RCS merge lookalike, we no longer need it. So long, merge, and thanks for all the fish! Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> 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 ca519b7..55ff83b 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -945,7 +945,7 @@ sub req_update
$log->debug("Temporary directory for merge is $dir");
- my $return = system("merge", $file_local, $file_old, $file_new);
+ my $return = system("git merge-file", $file_local, $file_old, $file_new);
$return >>= 8;
if ( $return == 0 )