Doug Barton 5d7b107e1c * 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>		2001-03-05 10:13:21 +00:00
..
Makefile	Almost a year exactly from when I first imported mergemaster at freebsdcon,	2000-10-26 05:36:35 +00:00
mergemaster.8	* Add two requested features, source'ing of /etc/mergemaster.rc, and	2001-03-05 10:13:21 +00:00
mergemaster.sh	* Add two requested features, source'ing of /etc/mergemaster.rc, and	2001-03-05 10:13:21 +00:00