diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-13 02:01:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 08:47:29 +0300 |
| commit | e2b7008752d85874919ea718d098fec01b4a9019 (patch) | |
| tree | 4175a000078a2fbff6da0291faa16ea592c1281c /merge-recursive.c | |
| parent | fbe0b24ca53111208b8ecd920cc112d0be13f93c (diff) | |
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions