K 10 svn:author V 5 dougb K 8 svn:date V 27 2001-05-28T13:10:16.000000Z K 7 svn:log V 65 Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc END