TortoiseGitMerge: When searching text, flash window when end of file reached or text not found

Based on TortoiseSVN revision #24828.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Use the proper format type and size specifiers

Found with Cppcheck and inspired by TortoiseSVN rev. #24808.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Do not include class name in definition

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Reduce scope of variables

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop unused code

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix diff script for Word files

Based on TortoiseSVN revision 24845

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>