Created attachment 145658 [details] patch Makefile recommends to always run mergemaster after system update from source. However, there are often a lot of files only having minor differences in comments. For example, those only with the change in $FreeBSD: xxx template. Such files require the user to choose 'i' again and again, often many times. The attached patch solves this problem. It offers the user the new option 'a', which would automatically accept all further files that differ only in comments.
batch change: For bugs that match the following - Status Is In progress AND - Untouched since 2018-01-01. AND - Affects Base System OR Documentation DO: Reset to open status. Note: I did a quick pass but if you are getting this email it might be worthwhile to double check to see if this bug ought to be closed.
After going through dozens of files with only the $FreeBSD:..$ line different, I have to second this suggestion. Since comment types can differ by file, even just checking for the $FreeBSD tag would be an improvement.
Created attachment 196193 [details] auto install if only change is $FreeBSD: ...$ lines.
Somehow, this patch never received any attention. And the problem is obviously still there.
^Triage: commit bit was taken in for safekeeping.