From 3c3393fd755583a4b7cb3b287df384b06bf0e4d6 Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Thu, 14 May 2026 15:32:46 +0100
Subject: feat(remote-dev): add mergiraf

git config defines a mergiraf merge driver; install it on the VM so
.gitattributes references actually resolve.
---
 remote-dev/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/remote-dev/home.nix b/remote-dev/home.nix
index a85c8f3..0db172b 100644
--- a/remote-dev/home.nix
+++ b/remote-dev/home.nix
@@ -52,6 +52,7 @@ in
     git
     gh
     delta
+    mergiraf
 
     # JSON / YAML
     jq
-- 
cgit v1.3.1