From f56efe6be1e53d8874a08136b4573eb60251ed1b Mon Sep 17 00:00:00 2001 From: dougb Date: Mon, 28 May 2001 09:46:18 +0000 Subject: [PATCH] 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 --- usr.sbin/mergemaster/mergemaster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index f8d1a4806909..769195643053 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 ''