Sync TortoiseIDiff and TortoiseUDiff from TortoiseSVN

Based on TortoiseSVN revision 23757, 23787, 24060, 24061

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