git-gui: Fix merge conflict display error when filename contains spaces