Fix warning

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Sync TortoiseIDiff from TortoiseSVN

Based on TortoiseSVN revisions 24640, 24644, 24645, 24658, 24740, 24753

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Can call TortoiseIDiff to resolve image conflict

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Also handle .tif and .tiff to call TortoiseGitIDiff

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
CAppUtils::StartExtMerge follows the style of TortoiseSVN

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