freebsd-rustdate show-merges

This shows summary information and potentially details about and merges files in your pending upgrade. By default it shows the diffs vs. your current version. With --upstream (-u) it will show the diff between the new upstream version and your merged result.

See Also

You’d get merged files from doing a upgrade.

If there are conflicts, you’ll use resolve-merges to fix them.

These merged files will get installed when you run install. You may also want to look at show-install for more info about what all will be installed.