Add a manifest file with compatibility info to every exe and dll.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25106 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Compile for the latest SDK version.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25107 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Initialize buffers before use.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25124 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Initialize buffers.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25133 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Replace the _T() macros with proper wide strings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25146 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Replace the _T() macros with simle chars.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25147 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Replace _t-string functions with the proper wide string equivalents.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25148 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
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.

(Fixes issue #607) : TortoiseMerge fails to restore Unicode characters


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25161 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove the fallback MessageBox() calls: the TaskDialog API is now available since we require at least Vista.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25190 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Suppress cppcheck warnings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25238 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Reduce scope of variables.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25239 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Constify methods.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25243 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Set a default path for the file open/save dialogs where useful.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25253 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Update to the svn trunk and replace calls to svn_diff_file_output_unified3 with svn_diff_file_output_unified4.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25262 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add a third column to the clear-auth dialog showing the username, and gather more information from the auth callback.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25267 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: Add Restore Default button in Colors Settings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25276 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add viewdata::marked variable.
(Updates issue #623) : Add Hunk Selection in TortoiseMerge

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25282 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add linemarked.ico.
(Updates issue #623) : Add Hunk Selection in TortoiseMerge

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25283 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: Mark block.
(Updates issue #623) : Add Hunk Selection in TortoiseMerge

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25284 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: Use left file except marked blocks.
(Fixes issue #623) : Add Hunk Selection in TortoiseMerge

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25285 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac