Git conflict resolution tools ec Easy terminal-native 3-way git mergetool vim-like workflow Neovim plugin (terminal buffer)