summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/lib/merger.c
Commit message (Expand)AuthorAgeFilesLines
* First part of import conflict merge from rcs-5.7 import.Peter Wemm1995-10-281-1/+1
* Import rcs-5.7, required for full support of cvs-1.6.Peter Wemm1995-10-281-0/+148