revert r24370, r24360, 24358, 24356, r24352, r24344, r24337
 * Before saving file ask what to fix
...

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