freebsd-dev/usr.sbin/mergemaster
Doug Barton e5a2a8f241 Be more consistent with the terminology, referring to "temporary and
installed" instead of "old and new". Inspired by the somewhat
non-linear PR, which really didn't have a fix, per se.

PR:		conf/27235 Roelof Osinga <roelof@eboa.com>
2001-05-28 09:46:18 +00:00
..
Makefile beforeinstall -> SCRIPTS. 2001-04-07 11:21:35 +00:00
mergemaster.8 mdoc(7) police: normalize .Nd. 2001-04-18 15:54:10 +00:00
mergemaster.sh Be more consistent with the terminology, referring to "temporary and 2001-05-28 09:46:18 +00:00