diff --git a/modules/hm/git.nix b/modules/hm/git.nix
index 5b90a8c..ae67d49 100644
--- a/modules/hm/git.nix
+++ b/modules/hm/git.nix
@@ -118,13 +118,13 @@ in
           algorithm = "histogram";
           colorMoved = "default";
           guitool = "meld";
-          tool = "meld";
+          tool = "vimdiff";
         };
         init.defaultBranch = "main";
         merge = {
           conflictstyle = "diff3";
           guitool = "meld";
-          tool = "meld";
+          tool = "vimdiff";
         };
         pull.rebase = true;
         rebase = {