TGitCache: Put "TortoiseGit Overlay Icon Server" as the first line of tray icon tooltip

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Show Gravatar in Log Dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Settings Dialogs move layout

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add caching for 7 days

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Make different TortoiseGit icon grouping of same repository if TortoiseGitProc.exe is from different directory

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Implement git checkout --merge

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'git-checkout-merge'
Fix warning

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

Based on TortoiseSVN revision 24470

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Implement 3-pane TortoiseGitIDiff

Based on TortoiseSVN revision 24640, 24644, 24645, 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>
TortoiseGitIDiff: Conflict resolving for images

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Use translated string of "Bisect Reset"

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Move Git and Hook Scripts settings upper in Settings TreeView

This may reduce the chance of scrolling down when new nodes are added in the future

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