Fixed issue #2340: Error dialog shown when editing a commit during rebase, even if changes are staged

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1872: Rebase edit doesn't amend files but only the commit message

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2342: Ignore whitespace blame option does not work

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
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>
Unmark blocks after using left blocks except marked

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
[WIP] 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>

Conflicts:
	src/TortoiseMerge/BaseView.cpp