Could not show submodule conflicts in TortoiseMerge, now can show the BASE, LOCAL, REMOTE in a simple message box

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