From af4e85523ad5e7b4ef30d3e3a0d3768fb6fe2ba6 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Tue, 19 Sep 2023 17:33:09 -0400 Subject: [PATCH] add dmi mergedriver to gitattributes (#22491) --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index d7a9139e8ac..07a337b2f3c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ ## Merger hooks, run tools/hooks/install.bat or install.sh to set up *.dmm text eol=lf merge=dmm +*.dmi binary merge=dmi