Remove nonexistent files from Zlib.vcxproj

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
"Use left file except marked blocks" -> "Leave only marked blocks"

Based on TortoiseSVN revision 25294

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

Based on TortoiseSVN revision 26033

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Can undo mark block

Based on TortoiseSVN revision 26034

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: On saving, ask user how to save marked blocks

Based on TortoiseSVN revision 26035

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'tmerge-save-marked'
Fixed issue #2312: Fix UTF-8 AutoCRLF issues with libgit2

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Correctly update folder status on file change and propagate to parents

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Make it possible to set progress control outside of ProgressDlg

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Show cloning progress roughly via calculating the number of object directories

This is useful when cloning a big repository locally.

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>