kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2006-12-18 16:20:53 -08:00
parent 910c00c8ca
commit 8336afa563
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rerere.perl
View File

@ -154,7 +154,7 @@ sub find_conflict {
sub merge { sub merge {
my ($name, $path) = @_; my ($name, $path) = @_;
record_preimage($path, "$rr_dir/$name/thisimage"); 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))) { qw(this pre post))) {
my $in; my $in;
open $in, "<$rr_dir/$name/thisimage" or open $in, "<$rr_dir/$name/thisimage" or