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>
This commit is contained in:
parent
910c00c8ca
commit
8336afa563
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user