]> git.ipfire.org Git - thirdparty/git.git/commit - merge-blobs.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbe0b24) | patch
Get rid of the dependency on RCS' merge program
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Tue, 12 Dec 2006 23:01:41 +0000 (00:01 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 05:47:29 +0000 (21:47 -0800)
commite2b7008752d85874919ea718d098fec01b4a9019
tree4175a000078a2fbff6da0291faa16ea592c1281ctree | snapshot
parentfbe0b24ca53111208b8ecd920cc112d0be13f93ccommit | 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>
.gitignore diff | blob | blame | history
Documentation/git-merge-index.txt diff | blob | blame | history
INSTALL diff | blob | blame | history
git-cvsserver.perl diff | blob | blame | history
git-rerere.perl diff | blob | blame | history
git.spec.in diff | blob | blame | history
merge-file.c diff | blob | blame | history
t/t0000-basic.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.