summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-12 23:01:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 05:47:29 (GMT)
commite2b7008752d85874919ea718d098fec01b4a9019 (patch)
tree4175a000078a2fbff6da0291faa16ea592c1281c /INSTALL
parentfbe0b24ca53111208b8ecd920cc112d0be13f93c (diff)
downloadgit-e2b7008752d85874919ea718d098fec01b4a9019.zip
git-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz
git-e2b7008752d85874919ea718d098fec01b4a9019.tar.bz2
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 'INSTALL')
-rw-r--r--INSTALL9
1 files changed, 0 insertions, 9 deletions
diff --git a/INSTALL b/INSTALL
index 8f69039..b5dd9f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -82,15 +82,6 @@ Issues of note:
do that even if it wasn't for git. There's no point in living
in the dark ages any more.
- - "merge", the standard UNIX three-way merge program. It usually
- comes with the "rcs" package on most Linux distributions, so if
- you have a developer install you probably have it already, but a
- "graphical user desktop" install might have left it out.
-
- You'll only need the merge program if you do development using
- git, and if you only use git to track other peoples work you'll
- never notice the lack of it.
-
- "wish", the Tcl/Tk windowing shell is used in gitk to show the
history graphically