Patch from ch3cooli:
use const CString & where possible

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24356 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Patch from ch3cooli:
Check all lines when saving to prevent false reporting whitespace problem.
When loading file, detecting first 10000 lines may be OK.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24357 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
* fix spelling
* use two-state checkboxes, not tri-state in setup mode

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24358 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
WhiteSpace-Fix handling:
* use a separate dialog for the setup: reusing the same dialog should be avoided
* don't treat labels as buttons
* never automatically fix: if there is something to fix, always ask first
* use defines instead of hard coded values


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24360 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix broken project file.

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