TortoiseGitMerge: Add Mark block and Use left file except marked blocks

This facilities partial commit (Restore after commit in TortoiseGit).
Based on TortoiseSVN revision 25282-25285.

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