summaryrefslogtreecommitdiff
path: root/git-rerere.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-19 00:20:53 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-19 00:20:53 (GMT)
commit8336afa563fbeff35e531396273065161181f04c (patch)
tree7187470ff1de2c9f5906ca053277314e30bb62f2 /git-rerere.perl
parent910c00c8ca4d998edb318cc232c03ec855cfa161 (diff)
downloadgit-8336afa563fbeff35e531396273065161181f04c.zip
git-8336afa563fbeff35e531396273065161181f04c.tar.gz
git-8336afa563fbeff35e531396273065161181f04c.tar.bz2
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>
Diffstat (limited to 'git-rerere.perl')
-rwxr-xr-xgit-rerere.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.perl b/git-rerere.perl
index fdd6854..4f69209 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