aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
...
* Update link to Making the World tutorial (now in the handbook)Mark Ovens2000-08-071-2/+2
* Remove single-space hard sentence breaks. These degrade the qualitySheldon Hearn2000-03-011-23/+46
* Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences inBill Fumerola1999-10-261-0/+2
* freebsd -> FreeBSDBill Fumerola1999-10-261-1/+1
* Add $FreeBSD$Bill Fumerola1999-10-261-2/+1
* Import mergemaster into the tree, a product of freebsdcon.Bill Fumerola1999-10-201-0/+278