| commit | 5e48d4f06a4c0f3814ebc781d1f822e28eb7df8c | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 22 Jan 2014 00:38:03 +0000 (22 08:38 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 22 Jan 2014 00:38:03 +0000 (22 08:38 +0800) | ||
| tree | bfcd8ccb49182be09aa8ca131dba77f967b26d64 | treesnapshot (tar.gz zip) |
| parent | 7f732ebdacf1b399b20c674287832ab7a91a2fab | commitdiff |
TortoiseGitMerge fails to restore Unicode characters
If the destination view is in ASCII and the source is not, we have to make sure that the text we copy from the other view can actually be saved in ASCII encoding.
If not, we have to change the destination view encoding to the same encoding as the source view encoding.
Based on TortoiseSVN revision 25161
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
If the destination view is in ASCII and the source is not, we have to make sure that the text we copy from the other view can actually be saved in ASCII encoding.
If not, we have to change the destination view encoding to the same encoding as the source view encoding.
Based on TortoiseSVN revision 25161
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
| src/TortoiseMerge/BaseView.cpp | diffblobblamehistory |