(review with "ignore whitespace" option on and editor that shows line moves, for example, TortoiseGitMerge)