TortoiseGitMerge: Mark this block edited state

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Use left file except edited blocks

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