Only mark lines as filtered if there's a filter active and if whitespace-changes...
commit37a720047b63ac5fef9bcb3b0439a6b32bf51283
authorSven Strickroth <email@cs-ware.de>
Fri, 17 Nov 2017 15:57:54 +0000 (17 16:57 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 17 Nov 2017 15:59:07 +0000 (17 16:59 +0100)
treec0dccd0e8088eaa3cbced1ba15dc20e6d7edbd20
parent0bbd574ed225ef0ddf98701720b4cb5e12dcc195
Only mark lines as filtered if there's a filter active and if whitespace-changes are ignored

Based on TortoiseSVN rev. 28047 and 28048.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/DiffData.h