make upgrade overwrites /etc/mail/mailer.conf

[Matthew Dillon]

    I think the goal ought to be a layout that does not require merging
    to update a system.  Mergemaster may be fine for a UNIX expert, but it's
    hell for a general user.

					-Matt
					Matthew Dillon 
					<dillon at xxxxxxxxxxxxx>