summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
* ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.chris1999-11-012-686/+1
| | | | | | | Delete the original mergemaster and modify Makefile to install mergemaster.sh. Seen no problem with by: billf No objections by: Doug Barton
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-263-0/+18
| | | | | | the FreeBSD default motd and the system motd Submitted by: author
* Use $FreeBSD$ (instead of the author's $Revision$) to report thebillf1999-10-262-6/+2
| | | | | | version number now that we have it. Reviewed by: author
* freebsd -> FreeBSDbillf1999-10-261-1/+1
|
* Add $FreeBSD$billf1999-10-261-2/+1
| | | | Submitted by: chris
* Co-MAINTAINER this module.billf1999-10-261-0/+1
|
* Add $FreeBSD$billf1999-10-252-0/+2
|
* mergemaster bmake glue.billf1999-10-201-0/+11
|
* Import mergemaster into the tree, a product of freebsdcon.billf1999-10-203-0/+1634
Submitted by: Doug Barton <doug@gorean.org>
OpenPOWER on IntegriCloud