make neovim default merge tool

Created by  Ian Boll  on June 2, 2022
N7JW5WH5725BE5LZ6TYSVVIL552LI43JCPKWFUGRW4AS5RKMS47AC
Change contents