d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more consistent with the terminology, referring to "temporary and

Browse Source 
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>
This commit is contained in:
Doug Barton 2001-05-28 09:46:18 +00:00
parent 217239504e
commit e5a2a8f241
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=77326
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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 ''