diff --git a/Brewfile b/Brewfile
index b6b691a..2828f3c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -37,6 +37,7 @@ brew 'libyaml'
 brew 'logrotate'
 brew 'make'
 brew 'mas'
+brew 'mergiraf'
 brew 'mosh'
 brew 'node'
 brew 'pandoc'
diff --git a/gitattributes b/gitattributes
new file mode 100644
index 0000000..388682c
--- /dev/null
+++ b/gitattributes
@@ -0,0 +1 @@
+merge=mergiraf
diff --git a/gitconfig b/gitconfig
index 605b858..381d410 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,6 +7,7 @@
 [tag]
 	gpgsign = true
 [core]
+	attributesfile = ~/.gitattributes
 	excludesfile = ~/.gitignore
 [color]
 	status = auto
@@ -76,13 +77,12 @@
 [credential "https://gist.github.com"]
 	helper =
 	helper = !op plugin run -- gh auth git-credential
-[merge]
-	tool = Kaleidoscope
+[merge "mergiraf"]
+	name = mergiraf
+	driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
 [mergetool "Kaleidoscope"]
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true
-[mergetool]
-	prompt = false
 [gitbutler]
 	aiModelProvider = anthropic
 	aiAnthropicKeyOption = bringYourOwn
diff --git a/install.sh b/install.sh
index 858c3d0..ee72ac5 100755
--- a/install.sh
+++ b/install.sh
@@ -26,6 +26,7 @@ SYMLINKS=(
   config/k9s
   erlang
   gemrc
+  gitattributes
   gitconfig
   gitignore
   hammerspoon