The 'mergemaster' command printed this: > *** Displaying differences between ./.cshrc and installed version: > > --- /.cshrc 2019-05-14 00:56:47.216325000 -0700 > +++ ./.cshrc 2020-09-09 08:16:49.515840000 -0700 The diff is between the installed version (/.cshrc) and the new version (./.cshrc). The message from mergemaster is in reverse. It should say: > *** Displaying differences between installed version and ./.cshrc: The way it is now is incorrect and causes confusion.
A commit references this bug: Author: emaste Date: Sun Oct 25 18:06:45 UTC 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 Changes: head/usr.sbin/mergemaster/mergemaster.sh
A commit references this bug: Author: emaste Date: Sun Nov 8 17:10:13 UTC 2020 New revision: 367489 URL: https://svnweb.freebsd.org/changeset/base/367489 Log: MFC r367042: 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 Changes: _U stable/12/ stable/12/usr.sbin/mergemaster/mergemaster.sh