Date: Sun, 25 Oct 2020 18:06:45 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367042 - head/usr.sbin/mergemaster Message-ID: <202010251806.09PI6jUE049726@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sun Oct 25 18:06:45 2020 New Revision: 367042 URL: https://svnweb.freebsd.org/changeset/base/367042 Log: mergemaster: Clarify installed and updated versions 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 Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Sun Oct 25 16:58:48 2020 (r367041) +++ head/usr.sbin/mergemaster/mergemaster.sh Sun Oct 25 18:06:45 2020 (r367042) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010251806.09PI6jUE049726>