summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/merge.c
AgeCommit message (Expand)Author
2014-10-10Zap some stored values never read; From Fritjof Bornebusch; ok nicm@Otto Moerbeek
2014-10-02exit in usage functions themselves; from Fritjof Bornebusch; ok nicm@Otto Moerbeek
2010-07-23Reduce variable/function name and whitespace differences betweenRay Lai
2007-04-26compatibility (`do nothing') options do not need to be announcedIgor Sobrado
2007-02-27As done in OpenCVS, general includes cleanup sweep. OK otto@.Xavier Santolaria
2006-08-11correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.Xavier Santolaria
2006-08-01Reduce rcs_buf_release() usage, improving binary support.Ray Lai
2006-05-15missing bits for a working merge(1). Built and enabled.Xavier Santolaria
2006-05-10starting bits for merge(1) replacement. Not built/linked yet.Xavier Santolaria