From 9d9c94c5ed18e3b2a8ca7bde966ebcba7f284118 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 30 Dec 2021 05:14:20 +0100
Subject: [PATCH] Set conflict style to diff3

---
 home-manager/roles/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/roles/default.nix b/home-manager/roles/default.nix
index ceb51ab6..bd6ea77d 100644
--- a/home-manager/roles/default.nix
+++ b/home-manager/roles/default.nix
@@ -67,6 +67,7 @@
       };
 
       extraConfig = {
+        merge.conflictStyle = "diff3";
         pull.ff = "only";
         core.editor = "vim";
         init.defaultBranch = "main";