Searched hist:73651 (Results 1 - 2 of 2) sorted by relevance
| /freebsd-9.3-release/usr.sbin/mergemaster/ | ||
| H A D | mergemaster.8 | diff 73651 Mon Mar 05 08:13:21 MST 2001 dougb * 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> |
| H A D | mergemaster.sh | diff 73651 Mon Mar 05 08:13:21 MST 2001 dougb * 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> |
Completed in 80 milliseconds