Allow to change file encoding
commite1bf4514b0b6ae20e56d4fe797d38b7d2ce74a8e
authorSven Strickroth <email@cs-ware.de>
Thu, 8 Oct 2015 12:41:27 +0000 (8 14:41 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 8 Oct 2015 12:41:27 +0000 (8 14:41 +0200)
tree2848ceb2f923e5e3e5eefe21b708bd3404c62ade
parentda98062c7102107cc7aaa7afe30853b6394a3586
Allow to change file encoding

Use the encoding comboboxes at the bottom right to reload the file with the specified encoding if the ctrl key is pressed.
The behavior is left as is if the ctrl key is not pressed, i.e. the shown file is converted to the specified encoding.

Based on TortoiseSVN revision #26882 and #26883.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/FileTextLines.cpp
src/TortoiseMerge/FileTextLines.h
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/resource.h