From 8336afa563fbeff35e531396273065161181f04c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Dec 2006 16:20:53 -0800 Subject: [PATCH] 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 --- git-rerere.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rerere.perl b/git-rerere.perl index fdd685489..4f692091e 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 -- 2.26.2