summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
Commit message (Expand)AuthorAgeFilesLines
* Reorder one of the new features based on experience. Since the numberdougb2000-11-011-12/+12
* Add several new features, reorder some code, and continue with thedougb2000-10-301-91/+136
* More changes that don't modify functionality.dougb2000-10-291-60/+76
* Whitespace only. Make the style of the contributed sections consistent withdougb2000-10-291-133/+134
* Make mergemaster ignore files in /dev if /dev is a devfs.ben2000-08-261-1/+6
* Use new aliases path (/etc/mail/aliases)gshapiro2000-08-131-1/+1
* Be more careful about selecting a PAGER.brian2000-08-091-7/+14
* Actually accept 'm' as a PAGER query response to mean 'more'.bsd2000-05-121-1/+1
* 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