diff options
Diffstat (limited to 'git-rerere.perl')
| -rwxr-xr-x | git-rerere.perl | 2 |
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 |