TortoiseGitMerge: Correctly handle BOM changes to files when applying patches
commitf7b4ffeb2830f9a8fa72d1b334c0a0ab12251ea7
authorSven Strickroth <email@cs-ware.de>
Sun, 2 Jan 2022 13:53:42 +0000 (2 14:53 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 2 Jan 2022 13:54:23 +0000 (2 14:54 +0100)
treec2588916166c9559c9bd86fc2c9bf50628f3ffd6
parentfaea30d6abe651ef91443beb1d9f93cb85c39300
TortoiseGitMerge: Correctly handle BOM changes to files when applying patches

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/TortoiseMerge/Patch.cpp
src/TortoiseMerge/Patch.h
test/UnitTests/PatchTest.cpp
test/UnitTests/resources/patches/bom-change.patch [new file with mode: 0644]