diff --git a/.gitattributes b/.gitattributes index 07507f1b668..3bb0f8b6071 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,6 @@ ## Merge hooks, run tools/hooks/install.bat or install.sh to set up *.dmm text eol=lf merge=dmm *.dmi binary merge=dmi - +## TGUI bundle merge drivers +*.bundle.* binary merge=tgui-merge-bundle +*.chunk.* binary merge=tgui-merge-bundle