@matheusbsbs / matheus-bagliano / commits / 8336afa563
Fork 0

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>

Junio C Hamano committed Dec 18, 2006 at 16:20 UTC 8336afa563fbeff35e531396273065161181f04c
1 file changed +1 -1
git-rerere.perl
+1 -1
@@ -154,7 +154,7 @@ sub find_conflict {
154 sub merge {
155 my ($name, $path) = @_;
156 record_preimage($path, "$rr_dir/$name/thisimage");
157 - unless (system('git merge-file', map { "$rr_dir/$name/${_}image" }
157 + unless (system('git', 'merge-file', map { "$rr_dir/$name/${_}image" }
158 qw(this pre post))) {
159 my $in;
160 open $in, "<$rr_dir/$name/thisimage" or