vimdiff for merge and serve/pull git cmds
Fix locales