Patch from ch3cooli:
Do not prompt unsaved edit if view is hidden

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24367 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Patch from ch3cooli:
This allows to test the traditional workflow on Win 7 without running in a real Win XP

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24368 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Revert r24368: the changes to the resource file (rc and h) were missing in the patch due to them being utf-16.
Also: for 1.9 support for XP will most likely be gone.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24369 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Improve space/tab inconsistency detection:
* only if there are consecutive spaces to match a tab is the file marked as using spaces
* only if there are tabs is the file marked as using tabs
* only if both tabs and spaces are used is the file marked as space/tab inconsistent.

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