Doug Barton 3aec794146 Remove references to CVS so that people will stop bringing it up ... For -p: The localtime update should have been excluded in the first place The make.conf comparison has been OBE for some time now, and there is no src.conf equivalent to share/examples/make.conf, so remove the whole thing. Update copyright		2012-10-05 05:01:42 +00:00
..
Makefile
mergemaster.8	1. Add a new option, --run-updates, to always or never run the newalises,	2011-11-02 07:40:23 +00:00
mergemaster.sh	Remove references to CVS so that people will stop bringing it up	2012-10-05 05:01:42 +00:00