TortoiseGitMerge: Refactor smart tab mode and update icons

Based on TortoiseSVN revision 25053, 25055, 25056, 25057

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