| commit | dd917de51ef72aa649ac1d0f0159aa0e95e745f3 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sat, 25 Jun 2016 16:30:31 +0000 (25 18:30 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sat, 25 Jun 2016 16:31:31 +0000 (25 18:31 +0200) | ||
| tree | 2b74c4905e5862e32aff103df1b39cad4d8febf1 | treesnapshot (tar.gz zip) |
| parent | 63384201aae95b077cde1c3afca8e5fa12646bf3 | commitdiff |
Fixed issue #2756: TortoiseGitMerge: Regex Filter doesn't filter from "Previous diff", "Next diff" operation
If there are no whitespace changes but diffs only because of a regex filter, mark the lines as normal and not with whitespace changes.
Based on TortoiseSVN rev. 27342.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
If there are no whitespace changes but diffs only because of a regex filter, mark the lines as normal and not with whitespace changes.
Based on TortoiseSVN rev. 27342.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseMerge/DiffData.cpp | diffblobblamehistory |