TortoiseGitMerge: Tab-whitespace conversion and fix inconsistency

Based on TortoiseSVN revision 24296, 24297, 24311, 24320, 24321, 24331, 24337, 24338, 24344

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Can fix inconsistent whitespace/EOL

Based on TortoiseSVN revision 24352, 24353, 24354

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