Fix vim as merge tool.
Fix colorscheme in gui.