From e9d62e56f73a1ecc772073ab3ce2705abf153028 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 18 Jun 2024 20:28:44 +0200
Subject: git: don't give me advice about merge conflicts

---
 user/settings/git.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user/settings')

diff --git a/user/settings/git.nix b/user/settings/git.nix
index 4726120c..463b5645 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -19,6 +19,7 @@
       };
       advice = {
         addEmptyPathspec = false;
+        mergeConflict = false;
       };
       ghq = {
         root = "${config.home.homeDirectory}/projects";
-- 
cgit 1.4.1