"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'