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>
Disable "This feature will be installed when required."

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2345: The Show Log dialog's View Patch side window is empty when the Working dir changes line is selected and no file is selected

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Do not report folder status for files

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix typo

Regression introduced in commit dff41c2d0fca2d8b70d1f73582492e85371fd54e.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Show diff stat using libgit2

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2348: Conflicts during rebase appends "conflicts" to commit message

Regression of commit 1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
SyncDlg: Fix graphical bug

The button was partly hidden by IDC_PROG_LABEL. Also move controls up to be more space efficient.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Update screenshots

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TGitCache: Correctly show file status for delete-modify conflict

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refresh file list if we don't know if conflict was successfully resolved

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Block working tree and re-crawl after resolving conflicts

Signed-off-by: Sven Strickroth <email@cs-ware.de>