diff --git a/home/git/default.nix b/home/git/default.nix
index 6f4434b..9f59d52 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -120,6 +120,10 @@ in
         defaultBranch = "main";
       };
 
+      merge = {
+        conflictStyle = "zdiff3";
+      };
+
       pull = {
         # Avoid useless merge commits
         rebase = true;