mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-15 20:51:40 +00:00
1d335dd9e9
Adds TG's mapmerge2, a new TGM-compatible merger that handles things like dictionary expansion much better than the old tool, as well as supporting a git merge hook for map files. This PR does not remove the old merger as this one is more annoying to setup.
13 lines
309 B
Bash
13 lines
309 B
Bash
#!/bin/bash
|
|
shopt -s nullglob
|
|
cd "$(dirname "$0")"
|
|
for f in *.hook; do
|
|
echo Installing hook: ${f%.hook}
|
|
cp $f ../../.git/hooks/${f%.hook}
|
|
done
|
|
for f in *.merge; do
|
|
echo Installing merge driver: ${f%.merge}
|
|
git config --replace-all merge.${f%.merge}.driver "tools/hooks/$f %P %O %A %B %L"
|
|
done
|
|
echo "Done"
|