summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Expand)AuthorAgeFilesLines
* 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
* Remove single-space hard sentence breaks. These degrade the qualitysheldonh2000-03-011-23/+46
* 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
* ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.chris1999-11-012-686/+1
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-263-0/+18
* Use $FreeBSD$ (instead of the author's $Revision$) to report thebillf1999-10-262-6/+2
* freebsd -> FreeBSDbillf1999-10-261-1/+1
* Add $FreeBSD$billf1999-10-261-2/+1
* 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
OpenPOWER on IntegriCloud