From 79edde180e69441837dc13f0398a7836249ca1cd Mon Sep 17 00:00:00 2001
From: Anton Bobov <anton@bobov.name>
Date: Tue, 7 Apr 2026 23:06:24 +0500
Subject: git: enable three-way merge for git am operations

---
 files/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'files/.gitconfig')

diff --git a/files/.gitconfig b/files/.gitconfig
index 9ea6405..a88a1c3 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -159,6 +159,8 @@
   process = git-lfs filter-process
 [mergetool "fugitive"]
   cmd = vim -c \"Gdiff\" \"$MERGED\"
+[am]
+  threeWay = true
 [fetch]
   prune = true
   writeCommitGraph = true
-- 
cgit v1.2.3