What's more: this seems not to be just a whitespace-at-the-end issue: patch -l still finds (fewer) conflicts.