didnt there used to be an option in xcode opendiff / filemerge to ignore innocuous white space changes? e.g. blank lines added / deleted, different indent amounts.
ignore whitespace in opendiff / filemerge xcode11
In File Merge preferences, you have Filters tab with an option:
Compress white spaces
Is it what you are looking for ?