K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2001-03-05T10:13:21.000000Z
K 7
svn:log
V 592
* Add two requested features, source'ing of /etc/mergemaster.rc, and
  asking the user to actually run the recommended commands related
  to installation of files such as aliases or login.conf.

* Return to using grep for CVS $Id comparison. Using ident caused too
  many problems for people with local CVS/RCS tags in their stuff.
  Attempt to make portability a little easier to maintain in spite of
  this change by defining the name of the tag to search for. This
  is a slightly different change that solves the problem in the PR.

PR:		bin/24564
Submitted by:	Tony Finch <dot@dotat.at>

END