git/nvim: Drop diffconflicts

See the discussion on
https://github.com/whiteinge/diffconflicts/issues/26

Also
https://www.eseth.org/2020/mergetools.html

git/.gitconfig

@@ -41,6 +41,9 @@
 [mergetool]
 	prompt = false
 	keepBackup = false
+	hideResolved = false
+[mergetool "nvimdiff1"]
+	hideResolved = true
 [pager]
 	difftool = true
 [pull]

nvim/.config/nvim/lua/plugins.lua

@@ -25,7 +25,6 @@ local init = function ()
   use 'lewis6991/gitsigns.nvim'
   use 'tpope/vim-fugitive'
   use 'https://github.com/SanchayanMaity/gitlinker.nvim'
-  use 'whiteinge/diffconflicts'
   -- Boost vim command line mode
   use 'vim-utils/vim-husk'
   -- Quickfix