summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/rcs/rcsmerge
Commit message (Collapse)AuthorAgeFilesLines
* $Id$ -> $FreeBSD$peter1999-08-272-2/+2
|
* Revert $FreeBSD$ to $Id$peter1997-02-222-2/+2
|
* Make the long-awaited change from $Id$ to $FreeBSD$jkh1997-01-142-2/+2
| | | | | | | | This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.
* Remove the $ Log: ... $ lines from the comments in the files that hadpeter1995-10-291-2/+1
| | | | | | | | | them. Good greif! This was causing an unimaginable amount of brain-damage! The mere fact that I griped about $ Log $ in a previous commit (misspelled deliberately here) meant that the blasted thing was being expanded from the middle of the log entry as well as the beginning, and using " * All these" as the comment leader.. AARGH!!!! We *really* need to prevent these from being expanded! (or remove the magic identifier from the source).
* First part of import conflict merge from rcs-5.7 import.peter1995-10-281-85/+117
| | | | | | | | | All those $Log$ entries, combined with the whitespace changes are a real pain. I'm committing this now, before it's completely finished to get it compiling and working again ASAP. Some of the FreeBSD specific features are not working in this commit yet (mainly rlog stuff and $FreeBSD$ support)
* This commit was generated by cvs2svn to compensate for changes in r11891,peter1995-10-281-4/+53
|\ | | | | | | which included commits to RCS files with non-trunk default branches.
| * Import rcs-5.7, required for full support of cvs-1.6.peter1995-10-283-91/+176
| | | | | | | | | | | | This is going to be pretty messy.... Although the vendor import was correct, both the vendor and release tags are the same "gnu"... :-/ Getting cvs to choose the correct one might be rather interesting...
* | Remove trailing whitespace.rgrimes1995-05-302-10/+13
| |
* | Update makefiles:conklin1993-07-091-8/+4
| | | | | | | | | | | | | | | | centralize obj/noobj conditional in Makefile.inc use DPADD don't compile profiling library install rcsfreeze correctly After this commit, the freebsd and netbsd rcs distribution will be in sync.
* | Really cleaned up obj/noobj this time (same as I did with CVS)nate1993-07-061-2/+7
| |
* | Fixed cvs to work with/without object directories and added missing rcsleannate1993-06-251-1/+1
|/ | | | directory to top level makefile.
* Updated GNU utilitiesjkh1993-06-183-0/+399
OpenPOWER on IntegriCloud