Doug Barton 2b0baf3e99 * Fix a small typo, thanks to olgeni ... * Document the COMP_CONFS variable in the .mergemasterrc example		2002-05-04 22:53:03 +00:00
..
Makefile	Perform a major cleanup of the usr.sbin Makefiles.	2001-07-20 06:20:32 +00:00
mergemaster.8	* Fix a small typo, thanks to olgeni	2002-05-04 22:53:03 +00:00
mergemaster.sh	* Add some niceties to make the -p option quieter, and better behaved	2002-05-04 22:45:12 +00:00