K 10 svn:author V 5 dougb K 8 svn:date V 27 2001-03-05T20:33:28.000000Z K 7 svn:log V 199 MFC the return to grep instead of ident for CVS $Id tags, and the requested features of source'ing /etc/mergemaster.rc and prompting the user to run recommended commands like 'newaliases' as needed. END