diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-13 00:01:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:47:29 -0800 |
| commit | e2b7008752d85874919ea718d098fec01b4a9019 (patch) | |
| tree | 4175a000078a2fbff6da0291faa16ea592c1281c /git-rerere.perl | |
| parent | fbe0b24ca53111208b8ecd920cc112d0be13f93c (diff) | |
| download | git-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz git-e2b7008752d85874919ea718d098fec01b4a9019.tar.xz | |
Get rid of the dependency on RCS' merge program
Now that we have git-merge-file, an RCS merge lookalike, we no longer
need it. So long, merge, and thanks for all the fish!
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 d3664ff49..2e8dbbd4e 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('merge', 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 |