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:
Date: Sun Oct 25 18:06:45 UTC 2020
New revision: 367042
mergemaster: Clarify installed and updated versions
Describe "diff installed new" as "Displaying differences between
installed and new." Previously mergemaster described them in the
Reported by: Yuri Victorovich
MFC after: 2 weeks