diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-13 00:01:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 21:47:29 -0800 |
| commit | e2b7008752d85874919ea718d098fec01b4a9019 (patch) | |
| tree | 4175a000078a2fbff6da0291faa16ea592c1281c /INSTALL | |
| parent | fbe0b24ca53111208b8ecd920cc112d0be13f93c (diff) | |
| download | git-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz git-e2b7008752d85874919ea718d098fec01b4a9019.tar.xz | |
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-- | INSTALL | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -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 |