[Bug 249214] mergemaster: The message about "Displaying differences between" is in reverse order

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=249214

            Bug ID: 249214
           Summary: mergemaster: The message about "Displaying differences
                    between" is in reverse order
           Product: Base System
           Version: 12.1-STABLE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: misc
          Assignee: bugs at FreeBSD.org
          Reporter: yuri at freebsd.org

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.

-- 
You are receiving this mail because:
You are the assignee for the bug.