5 Commits

Include renames

Author	SHA1	Message	Date
3 people	be9a8c8c14	Fix TGUI deconflict hooks, makes them work on windows (#24686) ... * Lets us install tgui merge drivers on windows * test this * gamer mode * debug * do it like this * test * test this * stop it being weirdly relative * more relative fixes * try cat * indentation * update CI stuff to cache * correct this * yarn * yarn consistency * do we even need to do this? (no we don't) * properly cache yarn deps in ci * Why do we even have that step --------- Co-authored-by: github-actions <github-actions@github.com>	2024-03-20 20:10:29 +00:00
warriorstar-orionandGitHub	af4e85523a	add dmi mergedriver to gitattributes (#22491)	2023-09-19 22:33:09 +01:00
warriorstar-orionandGitHub	274ef027dc	Add required configuration for automated map merge script. (#19484) ... * Update merge_driver script. * Actually tick and compile new files. * Improve marker description.	2022-11-05 15:58:35 +00:00
Tigercat2000	86b3869980	Remove old mapmerge driver	2016-02-18 20:38:22 -08:00
cib	79e4bfec2c	Added merge driver for .dmm files.	2012-11-11 01:02:19 +01:00