summaryrefslogtreecommitdiffstats
path: root/usr.bin/rcs/merge.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Pull in <time.h> for struct tm, used in rcs.hguenther2016-08-261-1/+2
| | | | ok deraadt@
* Zap some stored values never read; From Fritjof Bornebusch; ok nicm@otto2014-10-101-2/+1
|
* exit in usage functions themselves; from Fritjof Bornebusch; ok nicm@otto2014-10-021-4/+4
|
* Reduce variable/function name and whitespace differences betweenray2010-07-231-5/+5
| | | | | | cvs/rcs. OK xsa zinovik
* compatibility (`do nothing') options do not need to be announcedsobrado2007-04-261-3/+2
| | | | | | in the synopsis/usage(); we do not want `[-L label]' three times ok by jmc@, niallo@, and xsa@
* As done in OpenCVS, general includes cleanup sweep. OK otto@.xsa2007-02-271-2/+5
|
* correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.xsa2006-08-111-4/+12
|
* Reduce rcs_buf_release() usage, improving binary support.ray2006-08-011-10/+5
| | | | OK niallo@
* missing bits for a working merge(1). Built and enabled.xsa2006-05-151-4/+32
| | | | OK joris@ ray@.
* starting bits for merge(1) replacement. Not built/linked yet.xsa2006-05-101-0/+88
man page reviewed by jmc@.