Had a situation this week where there was a very large merge that conflicted on only 4 lines.
In the “preview” view in sublime merge (right side pane) it correctly showed only the 4 conflicting lines. However, after pressing resolve, in the popup window, a much larger section of the file was identified as the conflict, leading to confusion for one of my users who underwent a long and arduous merge instead of a quick one.
Tried some other diff clients - some were able to isolate the smaller conflict correctly. Is there an option I’m missing here in Sublime Merge? Maybe something I can turn off with a name like “Include entire hunk in conflicts”?