bin/87921: mergemaster(8) needs to be smarter about config files

[Mark Linimon]

Old Synopsis: mergemaster needs to be smarter about config files
New Synopsis: mergemaster(8) needs to be smarter about config files

Responsible-Changed-From-To: freebsd-bugs->dougb
Responsible-Changed-By: linimon
Responsible-Changed-When: Mon Oct 24 17:34:57 GMT 2005
Responsible-Changed-Why: 
Reclassify and assign.

http://www.freebsd.org/cgi/query-pr.cgi?pr=87921