New option to ignore comments when diffing:
* when saving, remove all comments from the file but leave empty lines
* use a config file describing file extensions and comment tokens for those (start line comment, start and end block comment tokens)
Update issue #5
Feature done, but UI is still missing.

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

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24916 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Color config when an added line is changed should follow color config of modified lines.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24917 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add a button to ignore changes in comments.
Update issue #5

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24919 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
* add regex line filters when saving files
* add config dialog to configure the line filter regexes
* add ribbon buttons to enable regex filters
(Closes issue #5) : Ignore changes in comments


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24932 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
If the target text can only be found in one line, do not say not found when end of line is reached, jump to the first found instead.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24934 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Can search previous within the same line.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24935 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: Add Search Up direction.
(Updates issue #575) : TortoiseMerge: Support more search functions

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24936 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Drop unused resource ID.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24937 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
For the ribbon mode, use a ribbon status bar instead of the normal MFC status bar and add buttons with submenus to the status bar to indicate the EOLs and encodings of the views. The EOLs and encodings can be changed with those submenus.
(Closes issue #593) : Change EOL and encoding from status bar


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

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24980 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use %Id instead of %ld for pointers.

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

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25001 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove the `_ProjectFileVersion` property from the project files.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25005 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use IsViewGood() to check view.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25010 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use angle brackets for system include.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25011 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix the C4100 warnings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25012 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix the signed/unsigned mismatch warnings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25013 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Utils/DragDropImpl.cpp: include stdafx.h so that the file is compiled with precompiled headers.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25014 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Simplify includes since those headers exist in the compiler include directories.

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