summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Expand)AuthorAgeFilesLines
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-261-0/+8
* Use $FreeBSD$ (instead of the author's $Revision$) to report thebillf1999-10-261-3/+1
* Add $FreeBSD$billf1999-10-251-0/+1
* Import mergemaster into the tree, a product of freebsdcon.billf1999-10-201-0/+678
OpenPOWER on IntegriCloud