Keep old git merge behaviour

I find it way to much / complicated and am used to my old way to merge
things which I keep for now.

home/programs/git.nix

@@ -107,16 +107,11 @@
 
     merge = {
       ff = true;
-      tool = "new";
-      conflictStyle = "diff3";
+      tool = "nvimdiff4";
     };
 
     "mergetool \"nvimdiff4\"" = {
       cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
     };
-    "mergetool \"new\"" = {
-      cmd = "${pkgs.neovim}/bin/nvim -f $MERGED $BASE $LOCAL $REMOTE -c 'MergetoolStart'";
-      trustExitCode = true;
-    };
   };
 }

home/programs/neovim.nix

@@ -260,12 +260,6 @@ in {
     }
 
     fugitive
-    {
-      plugin = vim-mergetool;
-      config = ''
-        let g:mergetool_layout = 'b,lr,m'
-      '';
-    }
 
     vim-commentary
     vim-indent-object