| commit | b37c326ca53189182fc5dca4944379ec94f0f2eb | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Tue, 16 Aug 2016 17:32:32 +0000 (16 19:32 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Tue, 16 Aug 2016 17:32:32 +0000 (16 19:32 +0200) | ||
| tree | e4f06abb80f8914d403bf311734e32cbec0c53d7 | treesnapshot (tar.gz zip) |
| parent | 07175c0239803da7a1a9caf1689df8baa0f7574a | commitdiff |
Fixed issue #2815: TortoiseGitMerge might hang with ignore comments enabled
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseMerge/FileTextLines.cpp | diffblobblamehistory |