VOREStation/tools/dmitool/git_merge_installer.bat at e6f679d147c75a405b080aa41e5b64158366b114 - VOREStation - Gitea

cyberpresidentvanellope/VOREStation

mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-20 13:47:12 +01:00

Files

T

Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748 )

* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again

2024-02-20 11:28:51 +01:00

7 lines

233 B

Batchfile

Raw Blame History

 @echo off
 set tab=
 echo. >> ../../.git/config
 echo [merge "merge-dmi"] >> ../../.git/config
 echo %tab%name = iconfile merge driver >> ../../.git/config
 echo %tab%driver = ./tools/dmitool/dmimerge.sh %%O %%A %%B >> ../../.git/config