summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-13 00:01:41 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-12 21:47:29 -0800
commite2b7008752d85874919ea718d098fec01b4a9019 (patch)
tree4175a000078a2fbff6da0291faa16ea592c1281c /.gitignore
parentfbe0b24ca53111208b8ecd920cc112d0be13f93c (diff)
downloadgit-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7f2cd55088..d706dd92c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ git-mailsplit
git-merge
git-merge-base
git-merge-index
+git-merge-file
git-merge-tree
git-merge-octopus
git-merge-one-file