TortoiseGitMerge: Fix endless loop when undoing the bottom view

Based on TortoiseSVN revision 24458

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