From 2fe7555002a40c6234118b0377f8e7dc9853fe79 Mon Sep 17 00:00:00 2001 From: Langbart Date: Thu, 23 Jan 2025 09:51:06 +0100 Subject: [PATCH] fix: git diff to work on LFS files for map xml files Users can enable this by setting: git config diff.lfs-xml.textconv cat Ref: #7519 PR: https://gitea.wildfiregames.com/0ad/0ad/pulls/7539 --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6973b2ebe1..956dd701ea 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,4 +8,4 @@ *.png filter=lfs diff=lfs merge=lfs -text *.psa filter=lfs diff=lfs merge=lfs -text *.ttf filter=lfs diff=lfs merge=lfs -text -binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text +binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs-xml merge=lfs -text