misc/143497: make mergemaster do the right thing automatically if the only difference in the file is comments

[Karl Lehenbauer]

>Number:         143497
>Category:       misc
>Synopsis:       make mergemaster do the right thing automatically if the only difference in the file is comments
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 02 18:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Karl Lehenbauer
>Release:        8.0-STABLE
>Organization:
FlightAware, LLC
>Environment:
FreeBSD papa.hou.flightaware.com 8.0-STABLE FreeBSD 8.0-STABLE #0: Tue Feb  2 11:26:14 CST 2010     karl at papa.hou.flightaware.com:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Most of the files mergemaster presents for consideration are identical except for a comment line.

Please modify mergemaster to either by default install files that only differ by a comment automatically or add a switch to do that.

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
>Unformatted: