Fix wrong comparison.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25056 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use TABMODE_NONE when initializing member variable.

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

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25058 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Rearrange the buttons in the TMerge ribbon: move all view related commands to a separate tab, and expand the 'block' commands so they're accessible with one click.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25061 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix bugs related to Ignore Comments.
* Fix endless loop when the file type has only line comment, such as INI
* Fix mis-ignored lines when the file type has only block comment, such as XML


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