RebaseDlg: Allow to split commits

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Do not disable Amend if error occurred

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Disable Amend if cherry pick is active is

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge branch 'rebase-split-commits'
Fixed issue #2311: Empty commits cannot be rebased

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Remove nonexistent files from Zlib.vcxproj

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

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TMerge save marked blocks

This continues http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074458

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