diff options
| author | dougb <dougb@FreeBSD.org> | 2001-05-28 09:46:18 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2001-05-28 09:46:18 +0000 |
| commit | d85b77042de8303a3766fcd0b9eea0e59f5d6005 (patch) | |
| tree | 75dc35c6ee38d15c944ebe667600e9222f5bdc72 /usr.sbin/mergemaster/mergemaster.sh | |
| parent | 5949b4419fd64d0ab199d1320b79102f6244927d (diff) | |
| download | FreeBSD-src-d85b77042de8303a3766fcd0b9eea0e59f5d6005.zip FreeBSD-src-d85b77042de8303a3766fcd0b9eea0e59f5d6005.tar.gz | |
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>
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index f8d1a48..7691956 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -144,8 +144,8 @@ diff_loop () { echo " Use 'i' to install the temporary ${COMPFILE}" case "${NO_INSTALLED}" in '') - echo " Use 'm' to merge the old and new versions" - echo " Use 'v' to view to differences between the old and new versions again" + echo " Use 'm' to merge the temporary and installed versions" + echo " Use 'v' to view the diff results again" ;; esac echo '' |
