From e2b7008752d85874919ea718d098fec01b4a9019 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 13 Dec 2006 00:01:41 +0100
Subject: 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>
---
 git-rerere.perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-rerere.perl')

diff --git a/git-rerere.perl b/git-rerere.perl
index d3664ff491..2e8dbbd4ea 100755
--- a/git-rerere.perl
+++ b/git-rerere.perl
@@ -154,7 +154,7 @@ sub find_conflict {
 sub merge {
 	my ($name, $path) = @_;
 	record_preimage($path, "$rr_dir/$name/thisimage");
-	unless (system('merge', map { "$rr_dir/$name/${_}image" }
+	unless (system('git merge-file', map { "$rr_dir/$name/${_}image" }
 		       qw(this pre post))) {
 		my $in;
 		open $in, "<$rr_dir/$name/thisimage" or
-- 
cgit v1.2.3