Files
Paradise/tools/hooks/dmm.merge
S34N 4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-21 23:53:19 +01:00

3 lines
69 B
Bash

#!/bin/sh
exec tools/bootstrap/python -m mapmerge2.merge_driver "$@"