From e1b96e84b0ef91f574d2bdca1d95e64744b365c4 Mon Sep 17 00:00:00 2001
From: James Cherti <60946298+jamescherti@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:24:40 -0400
Subject: [PATCH] vc-git-diff-switches: Ensure git drivers are invoked

---
 init.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/init.el b/init.el
index 6aa3067..090be47 100644
--- a/init.el
+++ b/init.el
@@ -173,7 +173,12 @@
 
 (setq vc-git-print-log-follow t)
 (setq vc-make-backup-files nil)  ; Do not backup version controlled files
-(setq vc-git-diff-switches '("--histogram"))  ; Faster algorithm for diffing.
+(setq vc-git-diff-switches
+      '("--histogram"  ;; Faster algorithm for diffing.
+        ;; --textconv ensures that custom diff drivers defined in .gitattributes
+        ;; are correctly invoked, so that vc-diff displays the expected output.
+        ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=79050
+        "--textconv"))
 
 ;;; Auto save