![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Tue, 12 Dec 2006 23:01:41 +0000 (00:01 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 05:47:29 +0000 (21:47 -0800) | ||
| commit | e2b7008752d85874919ea718d098fec01b4a9019 | |
| tree | 4175a000078a2fbff6da0291faa16ea592c1281c | tree | snapshot |
| parent | fbe0b24ca53111208b8ecd920cc112d0be13f93c | commit | 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>
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>
| .gitignore | diff | blob | history | |
| Documentation/git-merge-index.txt | diff | blob | history | |
| INSTALL | diff | blob | history | |
| git-cvsserver.perl | diff | blob | history | |
| git-rerere.perl | diff | blob | history | |
| git.spec.in | diff | blob | history | |
| merge-file.c | diff | blob | history | |
| t/t0000-basic.sh | diff | blob | history |