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

mergemaster: Clarify installed and updated versions

Browse Source 
Describe "diff installed new" as "Displaying differences between
installed and new."  Previously mergemaster described them in the
opposite order.

PR:		249214
Reported by:	Yuri Victorovich
MFC after:	2 weeks
This commit is contained in:
Ed Maste 2020-10-25 18:06:45 +00:00
parent eb5a54f880
commit f98cf03166
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367042
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ diff_loop () {
echo ' ====================================================================== '
echo ''
(
echo " *** Displaying differences between ${COMPFILE} and installed version:"
echo " *** Displaying differences between installed version and ${COMPFILE}:"
echo ''
diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"
) | ${PAGER}