summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
* Add several new features, reorder some code, and continue with thedougb2000-10-301-6/+58
* Update copyrightdougb2000-10-291-1/+1
* Update link to Making the World tutorial (now in the handbook)marko2000-08-071-2/+2
* Remove single-space hard sentence breaks. These degrade the qualitysheldonh2000-03-011-23/+46
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inbillf1999-10-261-0/+2
* freebsd -> FreeBSDbillf1999-10-261-1/+1
* Add $FreeBSD$billf1999-10-261-2/+1
* Import mergemaster into the tree, a product of freebsdcon.billf1999-10-201-0/+278
OpenPOWER on IntegriCloud