From: Junio C Hamano <junkio@cox.net>
Date: Tue, 19 Dec 2006 00:20:53 +0000 (-0800)
Subject: rerere: fix breakage of resolving.
X-Git-Tag: v1.5.0-rc0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8336afa563fbeff35e531396273065161181f04c;p=thirdparty%2Fgit.git

rerere: fix breakage of resolving.

commit e2b70087 botched the RCS merge to git-merge-file conversion.
There is no command called "git merge-file" (yes, we are using safer
variant of Perl's system(3)).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-rerere.perl b/git-rerere.perl
index fdd6854896..4f692091e7 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('git merge-file', 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