From 107627ef134e9e9da32ddfb73538459364772912 Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Fri, 31 Jan 2025 17:32:26 +0000
Subject: Set git's mergeTool.keepTemporaries=false

---
 home/.config/git/config | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'home')

diff --git a/home/.config/git/config b/home/.config/git/config
index 46b34c2..0ead8e7 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -43,6 +43,8 @@
 [merge "mergiraf"]
     name = mergiraf
     driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
+[mergetool]
+    keepTemporaries = false
 [mergetool "conflictmarker"]
     cmd = $EDITOR "$MERGED"
 [commit]
-- 
cgit v1.2.3-70-g09d2