git-gui: Make Ctrl-T safe to use for conflicting files.