summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.8
Commit message (Expand)AuthorAgeFilesLines
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
* * Update (c)dougb2002-02-121-1/+3
* mdoc(7) police: removed HISTORY info from the .Os call.ru2001-07-101-1/+1
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.dd2001-07-091-2/+0
* mdoc(7) police:ru2001-07-051-6/+7
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-051-2/+8
* Prepare for mdoc(7)NG.ru2000-12-271-4/+3
* mdoc(7) police: use the new features of the Nm macro.ru2000-11-201-1/+1
* mdoc(7) police: use certified section headers wherever possible.ru2000-11-171-1/+1
* Use Fx macro wherever possible.ru2000-11-141-1/+2
* * Reduce diffs to RELENG_4 by specifying a full path to sysctldougb2000-11-091-1/+1
* 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