aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge
Commit message (Collapse)AuthorAgeFilesLines
* $Id$ -> $FreeBSD$Peter Wemm1999-08-272-2/+2
| | | | Notes: svn path=/head/; revision=50472
* Add missing *roff macros to correct display about -V option.Steve Price1997-08-231-1/+3
| | | | | | | | PR: docs/4162 Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp Notes: svn path=/head/; revision=28619
* Revert $FreeBSD$ to $Id$Peter Wemm1997-02-222-2/+2
| | | | Notes: svn path=/head/; revision=22996
* Make the long-awaited change from $Id$ to $FreeBSD$Jordan K. Hubbard1997-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. Notes: svn path=/head/; revision=21673
* Import rcs-5.7, required for full support of cvs-1.6.Peter Wemm1995-10-283-0/+256
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... Notes: svn path=/vendor/misc-GNU/dist2/; revision=11891