TortoiseGitMerge: Correctly handle BOM changes to files when applying patches