Patch from ch3cooli:
fixes the following problem:
1. Resolve a conflict file with TortoiseMerge
2. Use text block from 'mine' before 'theirs' or
Use text block from 'theirs' before 'mine'
3. Left and right view are set to modified state.

Expected: left and right should not set modified.
Only bottom should be set modified.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24270 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Cast CString to LPCWSTR in sprintf() calls.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24271 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
 * Code deduplication move core of OnIndicator*view to BaseView as well as UseBlock
 * handle some more exotic case of wrong EOLs
 * rename texttype and lineendings attributes to prefix convention and make them protected

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24276 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove the LVS_EX_DOUBLEBUFFER fallback define.
It was needed with older SDKs.

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