Fix diffs of filtered lines
commit7ec52df5bf6dccee4d881226fe7d74fe58d265ea
authorSven Strickroth <email@cs-ware.de>
Sun, 12 Nov 2017 20:55:25 +0000 (12 21:55 +0100)
committerSven Strickroth <email@cs-ware.de>
Mon, 13 Nov 2017 15:49:01 +0000 (13 16:49 +0100)
treefe9a2e23c7dd7db05abe9cc6a736a8197efea4c9
parente4c7f381fa4f06c7ce55bfb666a219f74cd44c81
Fix diffs of filtered lines

* use a separate state for filtered lines that are otherwise identical
* show a faint green background for such filtered lines
* skip over filtered-only-changes lines when using prev/next-diff
* allow configuring of the filtered-background color

Based on TortoiseSVN rev. 28029 and 28032.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/BaseView.h
src/TortoiseMerge/DiffColors.cpp
src/TortoiseMerge/DiffColors.h
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/DiffStates.h
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/SetColorPage.cpp
src/TortoiseMerge/SetColorPage.h
src/TortoiseMerge/resource.h