aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* Make mergemaster only take single letters for options as well as loopAlfred Perlstein2000-04-021-114/+167
* Remove single-space hard sentence breaks. These degrade the qualitySheldon Hearn2000-03-011-23/+46
* Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.Bill Fumerola2000-02-121-1/+1
* Allow $PAGER to have arguments.Bill Fumerola2000-02-081-1/+1
* ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.Chris Costello1999-11-012-686/+1
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inBill Fumerola1999-10-263-0/+18
* Use $FreeBSD$ (instead of the author's $Revision$) to report theBill Fumerola1999-10-262-6/+2
* freebsd -> FreeBSDBill Fumerola1999-10-261-1/+1
* Add $FreeBSD$Bill Fumerola1999-10-261-2/+1
* Co-MAINTAINER this module.Bill Fumerola1999-10-261-0/+1
* Add $FreeBSD$Bill Fumerola1999-10-252-0/+2
* mergemaster bmake glue.Bill Fumerola1999-10-201-0/+11
* Import mergemaster into the tree, a product of freebsdcon.Bill Fumerola1999-10-203-0/+1634