From 6566c9bead13f5f977841797d465bdf0d85c88c9 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Mon, 16 Jun 2025 11:13:34 +0200
Subject: [PATCH] Using vimdiff as git merge tool

---
 modules/hm/git.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 = {