summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Expand)AuthorAgeFilesLines
* Make mergemaster only take single letters for options as well as loopalfred2000-04-021-114/+167
* Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.billf2000-02-121-1/+1
* Allow $PAGER to have arguments.billf2000-02-081-1/+1
* 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